diff --git a/partnercenter/azext_partnercenter/_headers.py b/partnercenter/azext_partnercenter/_headers.py
new file mode 100644
index 00000000..0106a282
--- /dev/null
+++ b/partnercenter/azext_partnercenter/_headers.py
@@ -0,0 +1,18 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+
+from azext_partnercenter.version import VERSION
+
+
+USER_AGENT_HEADER = {'User-Agent': f"AzureCLI-PCExt/{VERSION}"}
+
+
+def add_user_agent_header(set_headers_func):
+    """Adds the user agent header to the headers dictionary."""
+    if set_headers_func is None or not callable(set_headers_func):
+        raise ValueError("set_headers_func must be a callable function.")
+    key_name = list(USER_AGENT_HEADER.keys())[0]
+    set_headers_func(key_name, USER_AGENT_HEADER[key_name])
diff --git a/partnercenter/azext_partnercenter/_help.py b/partnercenter/azext_partnercenter/_help.py
index 6aa933f4..e04b1862 100644
--- a/partnercenter/azext_partnercenter/_help.py
+++ b/partnercenter/azext_partnercenter/_help.py
@@ -23,7 +23,6 @@ def _load_operations_help():
         'marketplace_offer_plan',
         'marketplace_offer_plan_listing',
         'marketplace_offer_plan_technicalconfiguration',
-        'marketplace_offer_setup',
         'marketplace_offer_submission'
     ]
     for module_name in operations_modules:
diff --git a/partnercenter/azext_partnercenter/clients/_client_factory.py b/partnercenter/azext_partnercenter/clients/_client_factory.py
index adb83c04..52f639ed 100644
--- a/partnercenter/azext_partnercenter/clients/_client_factory.py
+++ b/partnercenter/azext_partnercenter/clients/_client_factory.py
@@ -5,6 +5,11 @@
 
 # pylint: disable=line-too-long
 # pylint: disable=protected-access
+
+
+from azext_partnercenter._headers import add_user_agent_header
+
+
 def get_api_client(cli_ctx, *_):
     """Gets an instance of an sdk client"""
     # subscription_id = cli_ctx.data['subscription_id']
@@ -22,6 +27,7 @@ def get_api_client(cli_ctx, *_):
     # set authorixation header to the raw token credentials fetched
     api_client.set_default_header("Authorization", creds[0] + " " + creds[1])
     api_client.set_default_header("If-Match", "*")
+    add_user_agent_header(api_client.set_default_header)
 
     return api_client
 
@@ -41,5 +47,6 @@ def get_api_client_for_graph(cli_ctx, *_):
     # set authorixation header to the raw token credentials fetched
     api_client.set_default_header("Authorization", creds[0] + " " + creds[1])
     api_client.set_default_header("If-Match", "*")
+    add_user_agent_header(api_client.set_default_header)
 
     return api_client
diff --git a/partnercenter/azext_partnercenter/clients/_product_ingestion_api_client.py b/partnercenter/azext_partnercenter/clients/_product_ingestion_api_client.py
index 339432cd..20075227 100644
--- a/partnercenter/azext_partnercenter/clients/_product_ingestion_api_client.py
+++ b/partnercenter/azext_partnercenter/clients/_product_ingestion_api_client.py
@@ -9,7 +9,7 @@
 
 from time import time
 import requests
-from pydantic import Extra
+from azext_partnercenter._headers import USER_AGENT_HEADER
 from azext_partnercenter.vendored_sdks.production_ingestion.models import (
     Submission,
     ContainerPlanTechnicalConfiguration,
@@ -48,7 +48,9 @@ class ProductIngestionApiClient:
     """The Product Ingestion API client"""
     def __init__(self, access_token=None):
         self.configuration = ProductIngestionApiClientConfiguration(access_token=access_token)
-        self._default_headers = {'Accept': 'application/json'}
+
+        # User-Agent header value is used by marketplace eng to identify the client making the request
+        self._default_headers = {'Accept': 'application/json', **USER_AGENT_HEADER}
 
     def configure_resources(self, *resources):
         """Configures one or more resources
@@ -59,7 +61,7 @@ def configure_resources(self, *resources):
         operation_id = 'post-configure'
         configure_resources = ConfigureResources(resources=resources)
         data = configure_resources.dict(by_alias=True, exclude_unset=True)
-        data['$schema'] = 'https://product-ingestion.azureedge.net/schema/configure/2022-03-01-preview2'
+        data['$schema'] = 'https://schema.mp.microsoft.com/schema/configure/2022-03-01-preview2'
 
         for resource in data['resources']:
             if 'resourceName' in resource.keys():
@@ -70,7 +72,7 @@ def configure_resources(self, *resources):
         response = self.__call_api(operation_id, 'configure', data=data)
         response.raise_for_status()
 
-        ConfigureResourcesStatus.Config.extra = Extra.allow
+        ConfigureResourcesStatus.model_config = {'extra': 'allow'}
         status = ConfigureResourcesStatus.parse_obj(response.json())
 
         if status.job_status != JobStatus.completed:
@@ -102,7 +104,7 @@ def update_container_plan_technical_configuration_for_bundle(self, offer_durable
         setattr(configuration, 'cnabReferences', properties.cnab_references)
 
         resource = configuration.dict(by_alias=True)
-        resource['$schema'] = 'https://product-ingestion.azureedge.net/schema/container-plan-technical-configuration/2022-03-01-preview3'
+        resource['$schema'] = 'https://schema.mp.microsoft.com/schema/container-plan-technical-configuration/2022-03-01-preview3'
 
         del resource['resourceName']
         del resource['validations']
@@ -136,7 +138,7 @@ def publish_submission(self, target, offer_durable_id, submission_id=None):
         durable_id = DurableId(root=f"submission/{offer_durable_id}/{submission_id}") if submission_id is not None else None
 
         resource = {
-            '$schema': 'https://product-ingestion.azureedge.net/schema/submission/2022-03-01-preview2',
+            '$schema': 'https://schema.mp.microsoft.com/schema/submission/2022-03-01-preview2',
             'id': (None if durable_id is None else durable_id.root),
             'product': product_id.root,
             'target': {'targetType': target}
diff --git a/partnercenter/azext_partnercenter/clients/listing_media_client.py b/partnercenter/azext_partnercenter/clients/listing_media_client.py
index edc2e608..3bc51ab2 100644
--- a/partnercenter/azext_partnercenter/clients/listing_media_client.py
+++ b/partnercenter/azext_partnercenter/clients/listing_media_client.py
@@ -5,6 +5,7 @@
 
 # pylint: disable=line-too-long
 # pylint: disable=protected-access
+# pylint: disable=too-many-positional-arguments
 
 from azext_partnercenter.models.listing_image import ListingImage
 from azext_partnercenter.models.listing_video import ListingVideo
diff --git a/partnercenter/azext_partnercenter/clients/offer_client.py b/partnercenter/azext_partnercenter/clients/offer_client.py
index a6fd5f5e..9bdda541 100644
--- a/partnercenter/azext_partnercenter/clients/offer_client.py
+++ b/partnercenter/azext_partnercenter/clients/offer_client.py
@@ -72,11 +72,14 @@ def _map_product_to_offer(self, product):
             resource=Resource(durable_id=product.id, type=product.resource_type)
         )
 
+    # removed
     def get_setup(self, offer_external_id):
         offer = self.get(offer_external_id)
         result = self._sdk.product_client.products_product_id_setup_get(offer.resource.durable_id, self._get_access_token())
+        print(result)
         return self._map_setup(offer_external_id, result)
 
+    # removed
     def update_setup(self, parameters: OfferSetup):
         offer = self.get(parameters.id)
 
@@ -106,6 +109,7 @@ def update_setup(self, parameters: OfferSetup):
         offer_setup = self.get_setup(parameters.id)
         return offer_setup
 
+    # removed
     def _map_setup(self, offer_external_id, api_setup: MicrosoftIngestionApiModelsProductsAzureProductSetup) -> OfferSetup:
         reseller = (next((x for x in api_setup.channel_states if x['type'] == "Reseller"), None))['value'] == 'Enabled'
         sell_through_microsoft = api_setup.selling_option == 'ListAndSell'
@@ -171,7 +175,7 @@ def _get_sdk_product_by_external_offer_id(self, offer_external_id):
         """Package Internal helper method to get the SDK product object by Offer ID"""
         filter_expr = self._get_sdk_odata_filter_expression_by_external_offer_id(offer_external_id)
         products = self._sdk.product_client.products_get(self._get_access_token(), filter=filter_expr)
-        print(f"products is {products}")
+
         if products is None or len(products.value) == 0:
             return None
 
diff --git a/partnercenter/azext_partnercenter/clients/offer_submission_client.py b/partnercenter/azext_partnercenter/clients/offer_submission_client.py
index 60531cf5..b3eeed5b 100644
--- a/partnercenter/azext_partnercenter/clients/offer_submission_client.py
+++ b/partnercenter/azext_partnercenter/clients/offer_submission_client.py
@@ -31,14 +31,14 @@ def get(self, offer_external_id, submission_id):
         offer = self._offer_client.get(offer_external_id)
 
         if offer.type == "AzureContainer":
-            result = self._graph_api_client.get_submission(submission_id, offer.resource.durable_id)
+            result = self._graph_api_client.get_submission(offer.resource.durable_id, submission_id)
             return self._map_submission(result)
 
         if offer.type == "AzureApplication":
             result = self._sdk.submission_client.products_product_id_submissions_submission_id_get(offer.resource.durable_id, submission_id, self._get_access_token())
             return self._map_application_submission(result)
 
-        raise CLIError("Only AzureContainer and AzureApplication offers are supported for submission commands")
+        raise CLIError("Only AzureContainer and AzureApplication offers are supported for submission commands at this time")
 
     def list(self, offer_external_id):
         offer = self._offer_client.get(offer_external_id)
@@ -51,7 +51,7 @@ def list(self, offer_external_id):
             result = self._sdk.submission_client.products_product_id_submissions_get(offer.resource.durable_id, self._get_access_token())
             return list(map(self._map_application_submission, result.value))
 
-        raise CLIError("Only AzureContainer and AzureApplication offers are supported for submission commands")
+        raise CLIError("Only AzureContainer and AzureApplication offers are supported for submission commands at this time")
 
     def _get_offer_draft_instance(self, offer_durable_id, module):
         branches = self._sdk.branches_client.products_product_id_branches_get_by_module_modulemodule_get(
@@ -211,12 +211,12 @@ def _get_resources_and_variant_resources(self, durable_id, managed_application_v
 
     @staticmethod
     def _map_submission(s: MicrosoftIngestionApiModelsSubmissionsSubmission) -> OfferSubmission:
-        print(f"Mapping submission {s}")
         return OfferSubmission(
             id=s.id.root.split('/')[-1],
-            # lifecycle_state=s.substate,
-            # target=s.target.target_type,
-            # status=s.state,
-            # result=s.result,
-            created=s.published_time_in_utc
+            offer_id=s.product.root.root.split('/')[-1],
+            lifecycle_state=s.lifecycle_state,
+            target=s.target.target_type,
+            status=s.status,
+            result=s.result,
+            created=s.created
         )
diff --git a/partnercenter/azext_partnercenter/clients/plan_technicalconfiguration_client.py b/partnercenter/azext_partnercenter/clients/plan_technicalconfiguration_client.py
index 5c1ad0f5..2a8b3830 100644
--- a/partnercenter/azext_partnercenter/clients/plan_technicalconfiguration_client.py
+++ b/partnercenter/azext_partnercenter/clients/plan_technicalconfiguration_client.py
@@ -5,6 +5,7 @@
 # pylint: disable=line-too-long
 # pylint: disable=protected-access
 # pylint: disable=no-else-return
+# pylint: disable=too-many-positional-arguments
 
 import os
 from knack.util import CLIError
diff --git a/partnercenter/azext_partnercenter/operations/__init__.py b/partnercenter/azext_partnercenter/operations/__init__.py
index 22f9a2c1..427e02c9 100644
--- a/partnercenter/azext_partnercenter/operations/__init__.py
+++ b/partnercenter/azext_partnercenter/operations/__init__.py
@@ -11,7 +11,6 @@
 from azext_partnercenter.operations.marketplace_offer_listing_contact import MarketplaceOfferListingContactOperations
 from azext_partnercenter.operations.marketplace_offer_listing_uri import MarketplaceOfferListingUriOperations
 from azext_partnercenter.operations.marketplace_offer_listing import MarketplaceOfferListingOperations
-from azext_partnercenter.operations.marketplace_offer_setup import MarketplaceOfferSetupOperations
 from azext_partnercenter.operations.marketplace_offer_listing_media import MarketplaceOfferListingImageOperations
 from azext_partnercenter.operations.marketplace_offer_package import MarketplaceOfferPackageOperations
 from azext_partnercenter.operations.marketplace_offer_submission import MarketplaceOfferSubmissionOperations
@@ -25,7 +24,6 @@ def __init__(self, commands_loader):
             MarketplaceOfferPlanOperations(self),
             MarketplaceOfferPlanTechnicalConfigurationOperations(self),
             MarketplaceOfferListingOperations(self),
-            MarketplaceOfferSetupOperations(self),
             MarketplaceOfferPackageOperations(self),
             MarketplaceOfferSubmissionOperations(self),
             MarketplaceOfferPlanListingOperations(self),
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_contact/custom.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_contact/custom.py
index 0344b14c..9e8c36ed 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_contact/custom.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_contact/custom.py
@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
+# pylint: disable=too-many-positional-arguments
 
 from azure.cli.core.azclierror import ResourceNotFoundError
 from azext_partnercenter.models.listing_contact import ListingContact
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_uri/custom.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_uri/custom.py
index 96fbbb1c..a0e60084 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_uri/custom.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_listing_uri/custom.py
@@ -4,6 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=too-many-locals
 # pylint: disable=line-too-long
+# pylint: disable=too-many-positional-arguments
 
 from knack.util import CLIError
 from azext_partnercenter.models.listing_uri import ListingUri
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_package/_cnab_util.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_package/_cnab_util.py
index 984032fb..b0800325 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_package/_cnab_util.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_package/_cnab_util.py
@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 # pylint: disable=raise-missing-from
+# pylint: disable=too-many-positional-arguments
 
 import os
 import os.path
@@ -16,15 +17,30 @@
 
 def verify(manifest_file):
     container = _get_container(manifest_file)
-    result = container.exec_run('cpa verify', workdir=DATA_DIR)
-    return result
+
+    if container.status != 'running':
+        container.start()
+
+    result = container.exec_run('cpa verify', workdir=DATA_DIR, stream=True)
+    for output in result.output:
+        print(output.decode("utf-8"), end='')
+
+    container.stop()
 
 
 def bundle(manifest_file):
     container = _get_container(manifest_file)
+
+    if container.status != 'running':
+        container.start()
+
     acr_name = _get_acr_name(manifest_file)
-    result = container.exec_run('az acr login -n ' + acr_name)
-    result = container.exec_run('cpa buildbundle', workdir=DATA_DIR)
+    container.exec_run('az acr login -n ' + acr_name)
+    result = container.exec_run('cpa buildbundle', workdir=DATA_DIR, stream=True)
+    for output in result.output:
+        print(output.decode("utf-8"), end='')
+
+    container.stop()
     return result
 
 
@@ -37,7 +53,7 @@ def _get_container(manifest_file):
         mount_path = _get_mount_path(manifest_file)
         container = _run_container(container_name, mount_path)
     except:
-        raise CLIError('There was an unknow error when trying to find the cpacontainer')
+        raise CLIError('There was an unknown error when trying to find the cpacontainer')
     return container
 
 
@@ -51,7 +67,12 @@ def _run_container(container_name, mount_path):
 
     print(mount_path)
 
+    if client.images.list(name=img) == []:
+        print(f"Image {img} not found. Pulling the image...")
+        client.images.pull(img)
+
     volumes = ['/var/run/docker.sock:/var/run/docker.sock', f'{mount_path}:/data', f'{absolute_path}:/root/.azure']
+
     container = client.containers.run(img, cmd, detach=True, volumes=volumes, name=container_name)
     return container
 
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_package/custom.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_package/custom.py
index 779114e3..ef9a5b49 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_package/custom.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_package/custom.py
@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
+# pylint: disable=too-many-positional-arguments
 
 from azure.cli.core.azclierror import ResourceNotFoundError, InvalidArgumentValueError
 from knack.cli import CLIError
@@ -66,12 +67,8 @@ def _build_container_package_by_offer_type(client, offer_id, manifest_file, acti
 
 
 def _verify_cnab_bundle(manifest_file):
-    result = verify(manifest_file)
-    print(result.output.decode("utf-8"))
-    return result
+    verify(manifest_file)
 
 
 def _build_cnab_bundle(manifest_file):
-    result = bundle(manifest_file)
-    print(result.output.decode("utf-8"))
-    return result
+    bundle(manifest_file)
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/custom.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/custom.py
index 9060d1da..2efff77e 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/custom.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/custom.py
@@ -3,6 +3,8 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
+# pylint: disable=too-many-positional-arguments
+
 from knack.cli import CLIError
 from azext_partnercenter.vendored_sdks.production_ingestion.models import (ContainerCnabPlanTechnicalConfigurationProperties, CnabReference)
 from azext_partnercenter import ISSUES_URL
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/params.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/params.py
index c28c0a22..32e4db92 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/params.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_plan_technicalconfiguration/params.py
@@ -18,7 +18,7 @@ def load_arguments(commands_loader, _):
         c.argument('registry_name', arg_group='CNAB Resource', options_list=['--registry'], help='The name of the Azure Container Registry.')
         c.argument('repository_name', arg_group='CNAB Resource', options_list=['--repository'], help='The name of the image repository in the Azure Container Registry.')
         c.argument('tag', arg_group='CNAB Resource', options_list=['--tag'], help='The name of the image repository.')
-        c.argument('digest', arg_group='CNAB Resource', options_list=['--digest'], help='The digest of the bundle with a format of sha256:<hashcode>')
+        c.argument('digest', arg_group='CNAB Resource', options_list=['--digest'], help='The digest of the bundle with a format of sha256:hashcode')
         c.argument('package_path', options_list=['--package-path'], help='The full path to the package zip file')
         c.argument('public_azure_tenant_id', options_list=['--azure-tenant-id'], help='The public Azure Tenant ID of the account that will managed the package')
         c.argument('public_azure_authorization_principal', options_list=['--azure-auth-principal'], help='The principal that will managed the package when deployed to public Azure')
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/__init__.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/__init__.py
deleted file mode 100644
index 1d77c94a..00000000
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-from azext_partnercenter.operations.base import SubGroupOperations
-
-
-class MarketplaceOfferSetupOperations(SubGroupOperations):
-    pass
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/_help.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/_help.py
deleted file mode 100644
index 056dbf08..00000000
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/_help.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.
-# --------------------------------------------------------------------------------------------
-
-from knack.help_files import helps
-
-
-def load_help():
-    helps['partnercenter marketplace offer setup'] = """
-        type: group
-        short-summary: Manage a Marketplace Offer's setup.
-    """
-
-    helps['partnercenter marketplace offer setup update'] = """
-        type: command
-        short-summary: Update a marketplace offer
-        examples:
-        - name: Update an offer setup
-          text: |-
-                az partnercenter marketplace offer setup update --offer-id MyOfferId --sell-through-microsoft true
-    """
-
-    helps['partnercenter marketplace offer setup show'] = """
-        type: command
-        short-summary: Show the offer setup
-        examples:
-        - name: Show an offer's setup
-          text: |-
-                az partnercenter marketplace offer setup show --offer-id MyOfferId
-    """
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/commands.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/commands.py
deleted file mode 100644
index b767379f..00000000
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/commands.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-# pylint: disable=line-too-long
-
-from azure.cli.core.commands import CliCommandType
-from azext_partnercenter._client_factory import cf_offers
-
-
-def load_command_table(commands_loader, _):
-    operations_tmpl = 'azext_partnercenter.operations.marketplace_offer_setup.custom#{}'
-    command_type = CliCommandType(operations_tmpl='azext_partnercenter.clients#OfferClient.{}', client_factory=cf_offers)
-    custom_command_type = CliCommandType(operations_tmpl=operations_tmpl, client_factory=cf_offers)
-
-    with commands_loader.command_group('partnercenter marketplace offer setup', command_type=command_type,
-                                       custom_command_type=custom_command_type, is_preview=True) as g:
-        g.custom_show_command('show', 'get_setup', table_transformer=None)
-        g.generic_update_command('update', custom_func_name='update_setup', getter_name='get_setup', setter_name='update_setup')
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/custom.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/custom.py
deleted file mode 100644
index edf6593f..00000000
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/custom.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-# pylint: disable=line-too-long
-
-from azext_partnercenter.models.listing import Listing
-
-
-def get_setup(client, offer_id):
-    return client.get_setup(offer_id)
-
-
-def update_setup(instance, reseller=None, test_drive=None, sell_through_microsoft=None, trial_uri=None):
-    if reseller is not None:
-        instance.reseller_enabled = reseller
-
-    if test_drive is not None:
-        instance.test_drive = test_drive
-
-    if sell_through_microsoft is not None:
-        instance.sell_through_microsoft = sell_through_microsoft
-
-    if trial_uri is not None:
-        instance.trial_uri = trial_uri
-
-    return instance
-
-
-# TODO: clean up these unused methods
-def marketplace_offer_setup_update_get(client, offer_id):
-    return client.get_listing(offer_id)
-
-
-def marketplace_offer_setup_update_set(client, offer_id, parameters=None):
-    listing = Listing()
-    listing.id = parameters.id
-    listing.title = parameters.title
-    listing.summary = parameters.summary
-    listing.description = parameters.description
-    listing.short_description = parameters.short_description
-    listing.language_code = parameters.language_code
-    listing.odata_etag = parameters.odata_etag
-    listing.contacts = parameters.contacts
-    listing.uris = parameters.uris
-
-    result = client.create_or_update(offer_id, listing)
-    return result
-
-
-def marketplace_offer_setup_update_custom(instance, summary=None, short_description=None, description=None):
-    instance.summary = summary
-    instance.short_description = short_description
-    instance.description = description
-    return instance
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/params.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/params.py
deleted file mode 100644
index 527ca14d..00000000
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/params.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-# pylint: disable=line-too-long
-
-from enum import Enum
-from azure.cli.core.commands.parameters import get_three_state_flag
-from .validators import validate_test_drive
-
-
-class Arg(str, Enum):
-    """Setup command Arguments"""
-    reseller = 'reseller'
-    test_drive = 'test_drive'
-    sell_through_microsoft = 'sell_through_microsoft'
-
-
-arg_help = {
-    Arg.reseller: 'Indicates to enable the reseller channel for the offer.',
-    Arg.test_drive: """Whether test drive is enabled for the offer. The test drive option in the Microsoft commercial marketplace lets you configure a hands-on, self-guided tour of your product's key features""",
-    Arg.sell_through_microsoft: """Whether to sell through microsoft or list the offer through the marketplace and process transactions independently."""
-}
-
-
-def load_arguments(commands_loader, _):
-    with commands_loader.argument_context('partnercenter marketplace offer setup') as c:
-        c.argument('offer_id', options_list=['--offer-id', '--id'], help='The Offer ID.')
-
-    with commands_loader.argument_context('partnercenter marketplace offer setup update') as c:
-        c.argument('offer_external_id', options_list=['--offer-id', '--id'], help='The Offer ID.')
-        c.argument(Arg.reseller, arg_type=get_three_state_flag(), options_list=['--reseller'], help=arg_help[Arg.reseller])
-        c.argument(Arg.test_drive, arg_type=get_three_state_flag(), options_list=['--test-drive'], help=arg_help[Arg.test_drive], validator=validate_test_drive)
-        c.argument(Arg.sell_through_microsoft, arg_type=get_three_state_flag(), options_list=['--sell-through-microsoft'], help=arg_help[Arg.sell_through_microsoft])
-        c.argument('trial_uri', options_list=['--trial-uri'], help='The trial uri.')
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/validators.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/validators.py
deleted file mode 100644
index 076cd90c..00000000
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_setup/validators.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-# pylint: disable=line-too-long
-
-from knack.util import CLIError
-from azext_partnercenter._client_factory import cf_offers
-from azext_partnercenter.models import OfferType
-
-
-offer_types_supporting_test_drive = [OfferType.AZURETHIRDPARTYVIRTUALMACHINE, OfferType.AZUREAPPLICATION]
-
-
-def validate_test_drive(cmd, namespace):
-    """Validates that if test drive option is attempted to be enabled, that the offer type is supported."""
-    client = cf_offers(cmd.cli_ctx)
-    offer = client.get(namespace.offer_external_id)
-
-    if namespace.test_drive and (offer.type not in offer_types_supporting_test_drive):
-        raise CLIError(f'Test Drive can only be enabled for the following offer types: {OfferType.AZURETHIRDPARTYVIRTUALMACHINE}, {OfferType.AZUREAPPLICATION}')
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/custom.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/custom.py
index a3a9a4fa..6f734e8c 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/custom.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/custom.py
@@ -4,6 +4,9 @@
 # --------------------------------------------------------------------------------------------
 
 
+from azext_partnercenter.models.target_type import TargetType
+
+
 def get_submission(client, offer_id, submission_id):
     return client.get(offer_id, submission_id)
 
@@ -16,6 +19,6 @@ def delete_submission(client, offer_id, submission_id):
     return client.delete(offer_id, submission_id)
 
 
-def publish_submission(client, offer_id, submission_id, target):
+def publish_submission(client, offer_id, submission_id=None, target=TargetType.Draft.value):
     result = client.publish(offer_id, submission_id, target)
     return result
diff --git a/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/params.py b/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/params.py
index b202ba36..c9be4066 100644
--- a/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/params.py
+++ b/partnercenter/azext_partnercenter/operations/marketplace_offer_submission/params.py
@@ -11,7 +11,7 @@
 def load_arguments(commands_loader, _):
     with commands_loader.argument_context('partnercenter marketplace offer submission') as c:
         c.argument('offer_id', options_list=['--offer-id'], help='The offer ID.')
-        c.argument('submission_id', options_list=['--submission-id'], help='The offer submission ID.')
+        c.argument('submission_id', options_list=['--submission-id'], help='The offer submission ID. if not provided, the changes are only made to the draft state.')
 
     with commands_loader.argument_context('partnercenter marketplace offer submission publish') as c:
         c.argument('target', options_list=['--target'], arg_type=get_enum_type(TargetType), help='The target environment type to publish changes for the submission to.')
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_managed_app_creation.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_managed_app_creation.yaml
index 4354976c..f48b8fe0 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_managed_app_creation.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_managed_app_creation.yaml
@@ -7,26 +7,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:39 GMT
       request-id:
-      - 934cde88-06b4-42ed-ac36-f403bdcfba82
+      - 53209fd8-167e-4bd0-bc1c-54be0c129c94
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iT+gZQAAAAB3aVbRrd2IT4tC2KK7sQd4TU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153439Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000xzyu
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -40,25 +40,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"8893884c-0da4-ebf0-2e48-e4c5d82d2150"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"bb461586-4253-d74b-59d7-14c0af7a3338","variantID":"testdrive"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"a3343618-63b9-98bd-b6b5-41c3d6f0fbf7"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:39 GMT
       request-id:
-      - a54bdfae-e2f1-4b9b-9254-782d279cf613
+      - f2e7a309-d28f-488a-be78-c5f6e5fc5228
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iT+gZQAAAACebrO+8gL9QILY75S0z484TU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153440Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y01a
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -72,26 +72,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/listings/getByInstanceID(instanceID=8893884c-0da4-ebf0-2e48-e4c5d82d2150)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/listings/getByInstanceID(instanceID=a3343618-63b9-98bd-b6b5-41c3d6f0fbf7)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"48004c0c-0000-0800-0000-65a03f860000\"","id":"571690f5-67aa-91dd-e09b-025d208aca57"}]}'
+        Alias","keywords":[],"@odata.etag":"\"6a022fbd-0000-0800-0000-6802710c0000\"","id":"cf2d5662-0711-640d-afcd-284ef5ff6987"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:39 GMT
       request-id:
-      - a0ca6368-e787-4e1a-95ab-73201c6dc87b
+      - e9b8892d-4727-4963-b1fa-4dfa8ae9c49a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAAA3Waob1/+uSbkj2ZWO5EBJTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153440Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y03h
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -105,26 +105,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - 8043be71-15c5-4b9f-ae7a-06fc7b4f70f6
+      - cb5fe8ae-7867-47b4-ac61-fa62888e4f60
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAAAFxMojEH9hQ6/N3Mb7KTRXTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153440Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y07q
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -138,25 +138,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"8893884c-0da4-ebf0-2e48-e4c5d82d2150"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"bb461586-4253-d74b-59d7-14c0af7a3338","variantID":"testdrive"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"a3343618-63b9-98bd-b6b5-41c3d6f0fbf7"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - f7025c66-45c1-42ce-9174-2e8e691b0d6b
+      - 8845276b-7f77-4f5a-9447-94dd3faf0794
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iz+gZQAAAAB3ryOskuNITpVp3R6xrVdDTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153441Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f8wr
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -170,26 +170,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/listings/getByInstanceID(instanceID=8893884c-0da4-ebf0-2e48-e4c5d82d2150)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/listings/getByInstanceID(instanceID=a3343618-63b9-98bd-b6b5-41c3d6f0fbf7)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"48004c0c-0000-0800-0000-65a03f860000\"","id":"571690f5-67aa-91dd-e09b-025d208aca57"}]}'
+        Alias","keywords":[],"@odata.etag":"\"6a022fbd-0000-0800-0000-6802710c0000\"","id":"cf2d5662-0711-640d-afcd-284ef5ff6987"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - 6440a1b4-6128-4d6c-81fe-509ff0fcb46e
+      - 4ad7ef7b-a370-43c8-9e78-ae9acc449958
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iz+gZQAAAAC0CeAvlQMHRJanA5A0Ztn/TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153441Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f8yr
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -203,26 +203,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 9886a2bc-aef9-4111-a40e-9141cc39e864
+      - c8b3d840-1897-42c8-9be3-7a760047953e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAAC4zRdLe29RT5a4PNQsCjhiTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y0n9
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -236,26 +236,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 4e8337ad-4c78-43e6-9268-3cf89a511232
+      - 0c09e8bb-e7ef-4dc1-a9fd-bda3d265f699
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAAARTjL19h+fTZZgVN5W26XUTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f93k
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -269,25 +269,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"8893884c-0da4-ebf0-2e48-e4c5d82d2150"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"bb461586-4253-d74b-59d7-14c0af7a3338","variantID":"testdrive"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"a3343618-63b9-98bd-b6b5-41c3d6f0fbf7"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - cb780aaf-4dc2-4fa0-a7cd-b826d5a3be87
+      - 6a77629d-f37f-4f93-8942-6ecc4c60e04e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAACh7N0VN3cgRr+hBfWGalVjTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f971
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -301,26 +301,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/listings/getByInstanceID(instanceID=8893884c-0da4-ebf0-2e48-e4c5d82d2150)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/listings/getByInstanceID(instanceID=a3343618-63b9-98bd-b6b5-41c3d6f0fbf7)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"48004c0c-0000-0800-0000-65a03f860000\"","id":"571690f5-67aa-91dd-e09b-025d208aca57"}]}'
+        Alias","keywords":[],"@odata.etag":"\"6a022fbd-0000-0800-0000-6802710c0000\"","id":"cf2d5662-0711-640d-afcd-284ef5ff6987"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:44 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 0b99dc33-00a1-40da-a82a-c3ed4fa35fba
+      - 259c19b7-8636-4787-8001-9d15d1ee7f45
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAADLiyiAhfYCR67+rkAFBZwDTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-16b6fd4df76j9l2phC1BL1b85g0000000aqg0000000172ph
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -330,7 +330,7 @@ interactions:
     body: '{"resourceType": "AzureListing", "description": "Unreal Cloud DDC for Unreal
       Engine game development.", "title": "clitest000002 Alias", "summary": "A storage
       offer for Unreal Engine Game Developers", "shortDescription": "Unreal Cloud
-      DDC for Unreal Engine game development.", "@odata.etag": "\"48004c0c-0000-0800-0000-65a03f860000\"",
+      DDC for Unreal Engine game development.", "@odata.etag": "\"6a022fbd-0000-0800-0000-6802710c0000\"",
       "listingUris": [], "listingContacts": []}'
     headers:
       Accept:
@@ -340,30 +340,30 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/listings/571690f5-67aa-91dd-e09b-025d208aca57
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/listings/cf2d5662-0711-640d-afcd-284ef5ff6987
   response:
     body:
       string: '{"resourceType":"AzureListing","summary":"A storage offer for Unreal
         Engine Game Developers","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
         Alias","description":"Unreal Cloud DDC for Unreal Engine game development.","shortDescription":"Unreal
-        Cloud DDC for Unreal Engine game development.","@odata.etag":"\"4800990d-0000-0800-0000-65a03f8d0000\"","id":"571690f5-67aa-91dd-e09b-025d208aca57"}'
+        Cloud DDC for Unreal Engine game development.","@odata.etag":"\"6a0255bf-0000-0800-0000-680271130000\"","id":"cf2d5662-0711-640d-afcd-284ef5ff6987"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:44 GMT
+      - Fri, 18 Apr 2025 15:34:43 GMT
       etag:
-      - '"4800990d-0000-0800-0000-65a03f8d0000"'
+      - '"6a0255bf-0000-0800-0000-680271130000"'
       request-id:
-      - 6d9778b8-ead9-4231-af8a-732d0e41dede
+      - a6984cc0-0034-43a8-aced-1fccdb6ef43f
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jT+gZQAAAABHCNqY9JqOQa9l3LHt64D8TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153443Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f9cz
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -377,323 +377,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:34:43 GMT
       request-id:
-      - 36bd68f8-72ee-41dd-ac1f-1a4f0213c646
+      - 99a161bd-78d1-46a6-b8b0-e02545149d76
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAAAqIwN/7j3uQonYahgOvJjhTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
-      request-id:
-      - 55b29fe8-37c8-46d9-82cf-d87dbb02fe5d
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jj+gZQAAAAD7zWHGotE+Sp03mt8QCSk1TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
-      request-id:
-      - 762a89fb-8b17-4a3c-a7e4-129f7939b2b8
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jj+gZQAAAACFq2+oxO8GT5StetMdw626TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
-      request-id:
-      - e552ecc1-69a3-4380-9ee2-4e331d35b72b
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jz+gZQAAAABZNG+Oq/xPTIT44REjROHyTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
-      request-id:
-      - 78dd7204-d589-419c-83e3-a2b984baaca7
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jz+gZQAAAACsv3ZZEK5vTJzifwgU0ZP+TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
-      request-id:
-      - ea71f090-6035-4fd7-af06-28e794dee097
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kD+gZQAAAAAB6ivF+yPzRY6b0XN4RQg+TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: '{"resourceType": "AzureProductSetup", "enableTestDrive": false, "sellingOption":
-      "ListAndSell", "trialUri": "", "channelStates": [{"type": "Reseller", "value":
-      "Disabled"}]}'
-    headers:
-      Accept:
-      - application/json
-      Content-Type:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
-      request-id:
-      - e094d6c1-e13a-41d7-917f-34ec42b3e4a6
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kD+gZQAAAADnJLB9y9z8RYHRq/ypxtDzTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
-      request-id:
-      - 4f982f1a-ef62-4364-9c02-7492af502c9b
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kT+gZQAAAAB8PurulFvBT6/mvxSwnLDgTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
-      request-id:
-      - 4076a6f3-838e-4742-ae8c-a866c15f873d
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kj+gZQAAAADsq1SWBUz4RL4IkJldbM16TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:50 GMT
-      request-id:
-      - 9de834c8-ccff-43fd-b17c-7024f458e863
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kj+gZQAAAABJmSch8HSNR7rlNkF6sIrATU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153444Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f9nu
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -710,29 +413,29 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/variants
   response:
     body:
-      string: '{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000003name","conversionPaths":"*","externalID":"plantest-000003","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"managed-application","extendedProperties":[],"@odata.etag":"\"7601addd-0000-0800-0000-65a03f930000\"","id":"fb5f85d9-81de-4c49-9b35-b9fab53be6b0"}'
+      string: '{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000003name","conversionPaths":"*","externalID":"plantest-000003","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"managed-application","extendedProperties":[],"@odata.etag":"\"53004afc-0000-0800-0000-680271150000\"","id":"8973ccdc-92aa-48e8-9dec-81d063f939dc"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:51 GMT
+      - Fri, 18 Apr 2025 15:34:44 GMT
       etag:
-      - '"7601addd-0000-0800-0000-65a03f930000"'
+      - '"53004afc-0000-0800-0000-680271150000"'
       location:
-      - https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/variants/fb5f85d9-81de-4c49-9b35-b9fab53be6b0
+      - https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/variants/8973ccdc-92aa-48e8-9dec-81d063f939dc
       request-id:
-      - 8fe49d55-b1ac-4969-b31f-437d73e11322
+      - f656222c-9bbe-4643-8336-8d9a09b4f504
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kz+gZQAAAACqVKsx7IGLSq3T8ie0vbt0TU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153444Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f9th
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -746,26 +449,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:34:55 GMT
       request-id:
-      - 4c5a2718-466c-4d03-a5a0-af3b377f4826
+      - 496956de-97db-47d0-b9fd-b1402972a88e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nj+gZQAAAAC3eFhqyEECT4qGhGpP5w7WTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153455Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y4ff
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -779,25 +482,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"8893884c-0da4-ebf0-2e48-e4c5d82d2150"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"bb461586-4253-d74b-59d7-14c0af7a3338","variantID":"testdrive"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"68b68eb5-ad37-2c5f-324f-1c1b2bb3e0ae","variantID":"fb5f85d9-81de-4c49-9b35-b9fab53be6b0"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"a3343618-63b9-98bd-b6b5-41c3d6f0fbf7"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"5e1d9121-74c3-4ac5-ac4b-0d00ee05cf89","variantID":"8973ccdc-92aa-48e8-9dec-81d063f939dc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:34:56 GMT
       request-id:
-      - 69afa1ae-32e1-4320-a350-6889f0c977a4
+      - dd447599-2b61-497e-9679-06218ca354c1
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nj+gZQAAAABVLumF0K1ZT4NSU9dMQ0Q3TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153456Z-16b6fd4df76g488nhC1BL1pewn00000009hg00000001507t
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -811,26 +514,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:34:56 GMT
       request-id:
-      - 78b8faca-cfbf-4554-88f7-ff7814d40d61
+      - af37eabd-ec98-4c62-9ae3-3c800030c718
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAAAYX2M1zGjUSrxVHco/UGj4TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153456Z-16b6fd4df76g488nhC1BL1pewn00000009hg00000001509g
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -844,25 +547,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/variants
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureTestDriveVariant","state":"Inactive","@odata.etag":"\"7601d2d5-0000-0800-0000-65a03f860000\"","id":"testdrive"},{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000003name","conversionPaths":"*","externalID":"plantest-000003","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"managed-application","extendedProperties":[],"@odata.etag":"\"7601addd-0000-0800-0000-65a03f930000\"","id":"fb5f85d9-81de-4c49-9b35-b9fab53be6b0"}]}'
+      string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000003name","conversionPaths":"*","externalID":"plantest-000003","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"managed-application","extendedProperties":[],"@odata.etag":"\"53004afc-0000-0800-0000-680271150000\"","id":"8973ccdc-92aa-48e8-9dec-81d063f939dc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:34:56 GMT
       request-id:
-      - 2a562bc8-808b-429d-8733-7837a5684cbc
+      - 5af99d1c-5171-4951-81dc-7071f0564ff7
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAABjOOPqmd97SZj6zRso4ydZTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153457Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007805
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -876,25 +579,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/listings/getByInstanceID(instanceID=68b68eb5-ad37-2c5f-324f-1c1b2bb3e0ae)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/listings/getByInstanceID(instanceID=5e1d9121-74c3-4ac5-ac4b-0d00ee05cf89)
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000003name","keywords":[],"@odata.etag":"\"48002d0f-0000-0800-0000-65a03f960000\"","id":"e5127fe0-d673-ffbe-c06f-9d818096643f"}]}'
+      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000003name","keywords":[],"@odata.etag":"\"6a0234c0-0000-0800-0000-680271170000\"","id":"569a687e-06a7-bf9e-8415-54d1b703ca50"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:34:57 GMT
       request-id:
-      - b5756a36-2124-4a00-9a5a-e339fe2fe790
+      - 4b2a7ea3-ffa1-4b1d-bca5-0ab516aef338
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAAAtW03d8prsS40oD1EFhGZ5TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153457Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000782k
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -908,26 +611,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:04 GMT
+      - Fri, 18 Apr 2025 15:34:57 GMT
       request-id:
-      - 03c5c978-b601-4f31-aa82-b32895d1e8d9
+      - 4f0141d5-8f31-4d1a-90e6-16a9cf1dba88
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAACf8RT5SbiPS5PaC8hBadPJTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153457Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000786e
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -941,25 +644,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"8893884c-0da4-ebf0-2e48-e4c5d82d2150"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"bb461586-4253-d74b-59d7-14c0af7a3338","variantID":"testdrive"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"68b68eb5-ad37-2c5f-324f-1c1b2bb3e0ae","variantID":"fb5f85d9-81de-4c49-9b35-b9fab53be6b0"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"a3343618-63b9-98bd-b6b5-41c3d6f0fbf7"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"5e1d9121-74c3-4ac5-ac4b-0d00ee05cf89","variantID":"8973ccdc-92aa-48e8-9dec-81d063f939dc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:04 GMT
+      - Fri, 18 Apr 2025 15:34:57 GMT
       request-id:
-      - a68e522a-71f5-48cc-9a87-9053ee1d1678
+      - 573f1fd0-eef9-4aa8-b0ee-4b9f8ed4278b
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAABXAyvQVnr8TavsSYE6leYSTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153458Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000789h
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -973,26 +676,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"8e9368ff-1ed1-44ed-824d-e70517c47440"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:04 GMT
+      - Fri, 18 Apr 2025 15:34:58 GMT
       request-id:
-      - 39b98b82-a576-4d0b-a105-d11d0710cf09
+      - 157dbf8a-d262-42bc-ac3a-84b41c718850
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oT+gZQAAAAB5Ivuqg1tKRqBuP+XFwpdETU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153458Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y59w
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -1006,25 +709,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/variants
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureTestDriveVariant","state":"Inactive","@odata.etag":"\"7601d2d5-0000-0800-0000-65a03f860000\"","id":"testdrive"},{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000003name","conversionPaths":"*","externalID":"plantest-000003","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"managed-application","extendedProperties":[],"@odata.etag":"\"7601addd-0000-0800-0000-65a03f930000\"","id":"fb5f85d9-81de-4c49-9b35-b9fab53be6b0"}]}'
+      string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000003name","conversionPaths":"*","externalID":"plantest-000003","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"managed-application","extendedProperties":[],"@odata.etag":"\"53004afc-0000-0800-0000-680271150000\"","id":"8973ccdc-92aa-48e8-9dec-81d063f939dc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:05 GMT
+      - Fri, 18 Apr 2025 15:34:59 GMT
       request-id:
-      - 79383613-0779-4191-8cc7-313be9e7d68a
+      - e5ec6d33-becb-42a4-9cd3-4d0a578755c0
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oT+gZQAAAACcg7uUOHVASJDb0tVRbISCTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153459Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000078hm
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -1038,25 +741,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/listings/getByInstanceID(instanceID=68b68eb5-ad37-2c5f-324f-1c1b2bb3e0ae)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/listings/getByInstanceID(instanceID=5e1d9121-74c3-4ac5-ac4b-0d00ee05cf89)
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000003name","keywords":[],"@odata.etag":"\"48002d0f-0000-0800-0000-65a03f960000\"","id":"e5127fe0-d673-ffbe-c06f-9d818096643f"}]}'
+      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000003name","keywords":[],"@odata.etag":"\"6a0234c0-0000-0800-0000-680271170000\"","id":"569a687e-06a7-bf9e-8415-54d1b703ca50"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:05 GMT
+      - Fri, 18 Apr 2025 15:34:59 GMT
       request-id:
-      - dfbe9334-95df-408a-858c-23ccf2b97238
+      - e549f50c-eeae-4a85-8d9e-340eb767acbe
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oj+gZQAAAAAr7Da30rWAQYUxPLJ6yyjETU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153459Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000078m1
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -1065,8 +768,8 @@ interactions:
 - request:
     body: '{"resourceType": "AzureListing", "listingUris": [], "listingContacts":
       [], "gettingStartedInstructions": "", "languageCode": "en-us", "title": "plantest-000003name",
-      "keywords": [], "@odata.etag": "\"48002d0f-0000-0800-0000-65a03f960000\"", "ID":
-      "e5127fe0-d673-ffbe-c06f-9d818096643f", "shortDescription": "Unreal Cloud DDC
+      "keywords": [], "@odata.etag": "\"6a0234c0-0000-0800-0000-680271170000\"", "ID":
+      "569a687e-06a7-bf9e-8415-54d1b703ca50", "shortDescription": "Unreal Cloud DDC
       for Unreal Engine game development.", "description": "Unreal Cloud DDC for Unreal
       Engine game development."}'
     headers:
@@ -1077,29 +780,29 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/8e9368ff-1ed1-44ed-824d-e70517c47440/listings/e5127fe0-d673-ffbe-c06f-9d818096643f
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f/listings/569a687e-06a7-bf9e-8415-54d1b703ca50
   response:
     body:
       string: '{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000003name","description":"Unreal
         Cloud DDC for Unreal Engine game development.","shortDescription":"Unreal
-        Cloud DDC for Unreal Engine game development.","keywords":[],"@odata.etag":"\"4800ae11-0000-0800-0000-65a03fa20000\"","id":"e5127fe0-d673-ffbe-c06f-9d818096643f"}'
+        Cloud DDC for Unreal Engine game development.","keywords":[],"@odata.etag":"\"6a02bac2-0000-0800-0000-680271230000\"","id":"569a687e-06a7-bf9e-8415-54d1b703ca50"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:05 GMT
+      - Fri, 18 Apr 2025 15:34:59 GMT
       etag:
-      - '"4800ae11-0000-0800-0000-65a03fa20000"'
+      - '"6a02bac2-0000-0800-0000-680271230000"'
       request-id:
-      - ba7193ee-b72b-4de9-a7fe-afc188b128d5
+      - 5399f47f-90c3-4767-a591-6315842595ad
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oj+gZQAAAABUM1UBxbKzTJMtteGFlJyTTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153459Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000078qm
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer.yaml
index 9651a81e..b34dda9c 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer.yaml
@@ -11,27 +11,27 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: POST
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products
   response:
     body:
-      string: '{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"e04d17f2-f2af-47ef-ab18-39ff18bc233d"}'
+      string: '{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"eaea608e-d780-4d0b-85ff-df0a525cc0ff"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:11 GMT
+      - Fri, 18 Apr 2025 15:34:44 GMT
       location:
-      - https://api.partner.microsoft.com/v1.0/ingestion/products/e04d17f2-f2af-47ef-ab18-39ff18bc233d
+      - https://api.partner.microsoft.com/v1.0/ingestion/products/eaea608e-d780-4d0b-85ff-df0a525cc0ff
       request-id:
-      - 79cf48b6-fb8e-4a6b-acf6-600f6728b861
+      - f1f95ac0-110c-4ebd-a66c-6ad40c1b71e7
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oz+gZQAAAAC5UCX2+hlHQ4a3Hfta5LplTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y0q2
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -45,25 +45,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27offertest-000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"e04d17f2-f2af-47ef-ab18-39ff18bc233d"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"eaea608e-d780-4d0b-85ff-df0a525cc0ff"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:11 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - 22f42a2f-1dc0-49ff-8338-f9b4f3f38e63
+      - d42a9e26-cb11-416c-8a9d-745d4cca56e4
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0pz+gZQAAAADKUCmNA1lWSrmP8s6FPdFfTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014xh3
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -77,25 +77,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFDOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"e04d17f2-f2af-47ef-ab18-39ff18bc233d"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFDOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"bobjennytest","externalIDs":[{"type":"AzureOfferId","value":"bobjennytest"}],"isModularPublishing":true,"id":"8faa69e0-0de3-4c4e-ad7e-617ac7f6591b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:12 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - e80f0116-bddc-4b33-8476-7bac5012f5cf
+      - fabbf294-ec6c-4301-9cd1-59149df57c1c
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qD+gZQAAAAD7Kz1Jds/+QILXYWkWtrvaTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y1tc
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -109,25 +109,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFDOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIjA1QzFEOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm","externalIDs":[{"type":"AzureOfferId","value":"modm"}],"isModularPublishing":true,"id":"5f6e7a0c-0e30-418f-a107-39891409a3fb"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIjA1QzFEOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm","externalIDs":[{"type":"AzureOfferId","value":"modm"}],"isModularPublishing":true,"id":"5f6e7a0c-0e30-418f-a107-39891409a3fb"},{"resourceType":"AzureApplication","name":"bobjacoffer","externalIDs":[{"type":"AzureOfferId","value":"bobjacoffer"}],"isModularPublishing":true,"id":"7b9e81ba-145c-418a-8d70-9ee13b700174"},{"resourceType":"AzureApplication","name":"bobjennytest3","externalIDs":[{"type":"AzureOfferId","value":"bobjennytest3"}],"isModularPublishing":true,"id":"144bd43d-5115-40a0-ae24-e8899778c08d"},{"resourceType":"AzureApplication","name":"clitestl7cw56zyi4qpwxzly
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestl7cw56zyi4qpwxzly"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:12 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - b1948a90-0d3c-4007-b379-38b12dafd610
+      - f3fee9fb-8908-41d5-9814-18f9b7d64f07
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qD+gZQAAAADCq/anDZUlSKhW08M6BAPETU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y1w5
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -141,27 +142,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIjA1QzFEOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureContainer","name":"clitestqnkrliqtif2kjxjjl
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestqnkrliqtif2kjxjjl"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"},{"resourceType":"AzureContainer","name":"clitestaxpsexg53qydigpgy
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestaxpsexg53qydigpgy"}],"isModularPublishing":true,"id":"62296a52-b02e-4a58-b173-cedaedb0ba97"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"bobjacapitest","externalIDs":[{"type":"AzureOfferId","value":"bobjacapitest"}],"isModularPublishing":true,"id":"227afbfb-8186-4ee1-ae1c-a6bc9684826a"},{"resourceType":"AzureApplication","name":"bobjacjennytest4","externalIDs":[{"type":"AzureOfferId","value":"bobjacjennytest4"}],"isModularPublishing":true,"id":"abd5be7d-419d-4acf-9967-de67c1eef3ae"},{"resourceType":"AzureContainer","name":"kehillicontainer20250417","externalIDs":[{"type":"AzureOfferId","value":"kehillicontainer20250417"}],"isModularPublishing":true,"id":"73c476c7-16c1-4c24-b57c-2e6677f65da1"},{"resourceType":"AzureContainer","name":"clitestu4ybxh7ak6ltjqqoc
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestu4ybxh7ak6ltjqqoc"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"},{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"eaea608e-d780-4d0b-85ff-df0a525cc0ff"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:12 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - 83c4b423-0e0c-4588-97b1-1acdfd8a97c2
+      - cdad57aa-6da1-4431-bed5-c9d4284e6805
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qD+gZQAAAADfLZfV/3kGT7b06aMvPDkSTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y1yd
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -175,26 +175,91 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
+    method: GET
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
+  response:
+    body:
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFERkZGRkZGRkY0XCIsXCJtYXhcIjpcIjA1QzFFMzk5Q0Q2NzJDXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"thfalgou_modm","externalIDs":[{"type":"AzureOfferId","value":"thfalgou_modm"}],"isModularPublishing":true,"id":"516b52ae-9b95-4727-bb3f-2b884026cba6"},{"resourceType":"AzureContainer","name":"bobjaccontainer","externalIDs":[{"type":"AzureOfferId","value":"bobjaccontainer"}],"isModularPublishing":true,"id":"92aa9b07-3914-4b80-8c3b-b08e5d23b62d"}]}'
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 18 Apr 2025 15:34:47 GMT
+      request-id:
+      - deb032b9-75ff-4c29-8032-cb89b6f937c0
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      x-azure-ref:
+      - 20250418T153447Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000faf4
+      x-cache:
+      - CONFIG_NOCACHE
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      If-Match:
+      - '*'
+      User-Agent:
+      - AzureCLI-PCExt/0.2.6
+    method: GET
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFERkZGRkZGRkY0XCIsXCJtYXhcIjpcIjA1QzFFMzk5Q0Q2NzJDXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
+  response:
+    body:
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"SoftwareAsAService","name":"bobjacsaas","externalIDs":[{"type":"AzureOfferId","value":"bobjacsaas"}],"isModularPublishing":true,"id":"6db29c4f-cb0b-4b4c-a265-a2542573f980"}]}'
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 18 Apr 2025 15:34:47 GMT
+      request-id:
+      - 7fccd42e-5bfa-492f-b71c-490d32e20d4d
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      x-azure-ref:
+      - 20250418T153447Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fakf
+      x-cache:
+      - CONFIG_NOCACHE
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      If-Match:
+      - '*'
+      User-Agent:
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFNzMzOTlDRDVFXCIsXCJtYXhcIjpcIjA1QzFFOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureContainer","name":"clitestkja3kcndso56yykdv
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestkja3kcndso56yykdv"}],"isModularPublishing":true,"id":"22931ab4-7564-429d-994a-5f644173f86a"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFNzMzOTlDRDVFXCIsXCJtYXhcIjpcIjA1QzFFOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"SoftwareAsAService","name":"bobjacsaas1","externalIDs":[{"type":"AzureOfferId","value":"bobjacsaas1"}],"isModularPublishing":true,"id":"60d402fa-4d97-4359-9e48-7b4aecbfca74"},{"resourceType":"AzureApplication","name":"complexterraform2","externalIDs":[{"type":"AzureOfferId","value":"complexterraform2"}],"isModularPublishing":true,"id":"f1f1e4f5-ba96-4722-b4f7-760ff13b0cbb"},{"resourceType":"AzureContainer","name":"clitestpryg7gwobqkutnfp4
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestpryg7gwobqkutnfp4"}],"isModularPublishing":true,"id":"f626bb70-637a-4638-b908-43c8abf8b9f8"},{"resourceType":"AzureApplication","name":"clitestz7ghjq4dsierimn3n
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestz7ghjq4dsierimn3n"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:12 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - 4d682949-c9d8-4578-9a05-3b7136ad9a76
+      - cad3be92-9764-438c-a430-1369dd59ae82
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qD+gZQAAAAB4zQSVpMUJRZvwiTaL78v2TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153447Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000famp
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -208,25 +273,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFNzMzOTlDRDVFXCIsXCJtYXhcIjpcIjA1QzFFOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm-96","externalIDs":[{"type":"AzureOfferId","value":"modm-96"}],"isModularPublishing":true,"id":"891bb189-5099-46ad-937c-9436c5de67f7"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm-96","externalIDs":[{"type":"AzureOfferId","value":"modm-96"}],"isModularPublishing":true,"id":"891bb189-5099-46ad-937c-9436c5de67f7"},{"resourceType":"AzureContainer","name":"clitest2x2ucxm3gi4mccu2t","externalIDs":[{"type":"AzureOfferId","value":"clitest2x2ucxm3gi4mccu2t"}],"isModularPublishing":true,"id":"c642e91d-0047-4832-9761-4fa2fd9bd7a3"},{"resourceType":"AzureApplication","name":"simpleterraform","externalIDs":[{"type":"AzureOfferId","value":"simpleterraform"}],"isModularPublishing":true,"id":"ce5875c6-5062-4391-a315-99dea3d3d8b8"},{"resourceType":"AzureApplication","name":"complexterraform","externalIDs":[{"type":"AzureOfferId","value":"complexterraform"}],"isModularPublishing":true,"id":"1ede1147-20da-4adc-88eb-1d576332ed47"},{"resourceType":"AzureApplication","name":"bobjacapitest2","externalIDs":[{"type":"AzureOfferId","value":"bobjacapitest2"}],"isModularPublishing":true,"id":"246aed98-915f-4706-b0e8-6d8f2a9a8fdc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:13 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - bc8fca7b-d78e-41f4-ba28-6fa0f7959741
+      - 8ed91e35-a121-493f-b8aa-36d5d5c9b80e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qT+gZQAAAAA8TKujuTTeQbIVBZQxcQVyTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153448Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000faqn
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -240,26 +305,58 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"clitestmbztczfkqavmexvga
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestmbztczfkqavmexvga"}],"isModularPublishing":true,"id":"3d153867-3c20-40b6-9ef2-0b3feac74a49"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFRDY3MzM5OUMyXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"bobjennytestnoplan","externalIDs":[{"type":"AzureOfferId","value":"bobjennytestnoplan"}],"isModularPublishing":true,"id":"2a81d504-e0ea-442f-897c-10b87fd42578"},{"resourceType":"AzureApplication","name":"bobjennytest5","externalIDs":[{"type":"AzureOfferId","value":"bobjennytest5"}],"isModularPublishing":true,"id":"ae7ed961-493e-42d6-9e6a-0d81d600186a"},{"resourceType":"AzureThirdPartyVirtualMachine","name":"kehillivm20250418","externalIDs":[{"type":"AzureOfferId","value":"kehillivm20250418"}],"isModularPublishing":true,"id":"99b578c2-bf71-4b5f-b326-1d93c3a7a0b7"}]}'
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 18 Apr 2025 15:34:48 GMT
+      request-id:
+      - b246feb2-6133-43d6-80a2-19efbfab4fcc
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      x-azure-ref:
+      - 20250418T153448Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y2cc
+      x-cache:
+      - CONFIG_NOCACHE
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      If-Match:
+      - '*'
+      User-Agent:
+      - AzureCLI-PCExt/0.2.6
+    method: GET
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFRDY3MzM5OUMyXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
+  response:
+    body:
+      string: '{"value":[{"resourceType":"AzureApplication","name":"simplebicep","externalIDs":[{"type":"AzureOfferId","value":"simplebicep"}],"isModularPublishing":true,"id":"b1d5db4c-a7af-423a-b202-238ef4a41198"},{"resourceType":"AzureContainer","name":"clitesteh5b4gi2m5s4h5mfr
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitesteh5b4gi2m5s4h5mfr"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:13 GMT
+      - Fri, 18 Apr 2025 15:34:48 GMT
       request-id:
-      - b924e634-d9f4-4126-ae51-1da84a8ff45b
+      - d3844ab6-254a-4cbb-acc3-12e39511ab72
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qT+gZQAAAAB57IyvS4VCQL82IsbKdQD3TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153448Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y2e4
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -273,25 +370,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27offertest-000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"e04d17f2-f2af-47ef-ab18-39ff18bc233d"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"offertest-000001-alias","externalIDs":[{"type":"AzureOfferId","value":"offertest-000001"}],"isModularPublishing":true,"id":"eaea608e-d780-4d0b-85ff-df0a525cc0ff"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:14 GMT
+      - Fri, 18 Apr 2025 15:34:48 GMT
       request-id:
-      - 9f8ad520-9496-4bcf-9eda-b6f33ac16de4
+      - b63e7db2-dcc8-4bc2-a695-8c8b3d09f861
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qT+gZQAAAAAQ4OFsa4uuQrrcK60OiwlYTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153449Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000075xq
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -305,9 +402,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: DELETE
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/e04d17f2-f2af-47ef-ab18-39ff18bc233d
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/eaea608e-d780-4d0b-85ff-df0a525cc0ff
   response:
     body:
       string: ''
@@ -315,13 +412,13 @@ interactions:
       content-length:
       - '0'
       date:
-      - Thu, 11 Jan 2024 19:21:15 GMT
+      - Fri, 18 Apr 2025 15:34:51 GMT
       request-id:
-      - baf5c423-f367-414a-95d2-da1fa5e3dd0d
+      - 4d382bd8-e18d-4467-9f1a-5bb7f28a12b3
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       x-azure-ref:
-      - 0qj+gZQAAAABLBAqDe4ZyRZi7MEk41rxWTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153449Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000761w
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -335,25 +432,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIjA1QzFEOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm","externalIDs":[{"type":"AzureOfferId","value":"modm"}],"isModularPublishing":true,"id":"5f6e7a0c-0e30-418f-a107-39891409a3fb"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFDOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"bobjennytest","externalIDs":[{"type":"AzureOfferId","value":"bobjennytest"}],"isModularPublishing":true,"id":"8faa69e0-0de3-4c4e-ad7e-617ac7f6591b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:16 GMT
+      - Fri, 18 Apr 2025 15:34:51 GMT
       request-id:
-      - 68d46d01-381d-432f-bce8-137162e782d9
+      - 0317943f-522a-43d8-912a-138628aab5b2
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rD+gZQAAAAAJr6iNVIeKT6/D6g+FPXDeTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153451Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000076ky
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -367,27 +464,91 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
+    method: GET
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFDOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
+  response:
+    body:
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIjA1QzFEOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm","externalIDs":[{"type":"AzureOfferId","value":"modm"}],"isModularPublishing":true,"id":"5f6e7a0c-0e30-418f-a107-39891409a3fb"},{"resourceType":"AzureApplication","name":"bobjacoffer","externalIDs":[{"type":"AzureOfferId","value":"bobjacoffer"}],"isModularPublishing":true,"id":"7b9e81ba-145c-418a-8d70-9ee13b700174"},{"resourceType":"AzureApplication","name":"bobjennytest3","externalIDs":[{"type":"AzureOfferId","value":"bobjennytest3"}],"isModularPublishing":true,"id":"144bd43d-5115-40a0-ae24-e8899778c08d"},{"resourceType":"AzureApplication","name":"clitestl7cw56zyi4qpwxzly
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestl7cw56zyi4qpwxzly"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 18 Apr 2025 15:34:51 GMT
+      request-id:
+      - 57c587de-ad40-4a5d-882f-a5ab975a4597
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      x-azure-ref:
+      - 20250418T153451Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000076ns
+      x-cache:
+      - CONFIG_NOCACHE
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      If-Match:
+      - '*'
+      User-Agent:
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIjA1QzFEOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureContainer","name":"clitestqnkrliqtif2kjxjjl
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestqnkrliqtif2kjxjjl"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"},{"resourceType":"AzureContainer","name":"clitestaxpsexg53qydigpgy
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestaxpsexg53qydigpgy"}],"isModularPublishing":true,"id":"62296a52-b02e-4a58-b173-cedaedb0ba97"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"bobjacapitest","externalIDs":[{"type":"AzureOfferId","value":"bobjacapitest"}],"isModularPublishing":true,"id":"227afbfb-8186-4ee1-ae1c-a6bc9684826a"},{"resourceType":"AzureApplication","name":"bobjacjennytest4","externalIDs":[{"type":"AzureOfferId","value":"bobjacjennytest4"}],"isModularPublishing":true,"id":"abd5be7d-419d-4acf-9967-de67c1eef3ae"},{"resourceType":"AzureContainer","name":"kehillicontainer20250417","externalIDs":[{"type":"AzureOfferId","value":"kehillicontainer20250417"}],"isModularPublishing":true,"id":"73c476c7-16c1-4c24-b57c-2e6677f65da1"},{"resourceType":"AzureContainer","name":"clitestu4ybxh7ak6ltjqqoc
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestu4ybxh7ak6ltjqqoc"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 18 Apr 2025 15:34:51 GMT
+      request-id:
+      - 353515ca-9e86-473c-a6fd-1005b2e41ed2
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      x-azure-ref:
+      - 20250418T153451Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000076rb
+      x-cache:
+      - CONFIG_NOCACHE
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      If-Match:
+      - '*'
+      User-Agent:
+      - AzureCLI-PCExt/0.2.6
+    method: GET
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFEOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
+  response:
+    body:
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFERkZGRkZGRkY0XCIsXCJtYXhcIjpcIjA1QzFFMzk5Q0Q2NzJDXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"thfalgou_modm","externalIDs":[{"type":"AzureOfferId","value":"thfalgou_modm"}],"isModularPublishing":true,"id":"516b52ae-9b95-4727-bb3f-2b884026cba6"},{"resourceType":"AzureContainer","name":"bobjaccontainer","externalIDs":[{"type":"AzureOfferId","value":"bobjaccontainer"}],"isModularPublishing":true,"id":"92aa9b07-3914-4b80-8c3b-b08e5d23b62d"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:16 GMT
+      - Fri, 18 Apr 2025 15:34:52 GMT
       request-id:
-      - 278bb32c-7b4c-4320-84c9-679c1e294dc2
+      - e76ef79f-d338-462d-aca5-64bb6ec24eb5
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rD+gZQAAAAC6rVnY88dBSryNMOuteR++TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153452Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000076v1
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -401,26 +562,58 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
+    method: GET
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFERkZGRkZGRkY0XCIsXCJtYXhcIjpcIjA1QzFFMzk5Q0Q2NzJDXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
+  response:
+    body:
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"SoftwareAsAService","name":"bobjacsaas","externalIDs":[{"type":"AzureOfferId","value":"bobjacsaas"}],"isModularPublishing":true,"id":"6db29c4f-cb0b-4b4c-a265-a2542573f980"}]}'
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 18 Apr 2025 15:34:52 GMT
+      request-id:
+      - 82f5d08f-d39e-4894-a562-f4c3794083ac
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      x-azure-ref:
+      - 20250418T153452Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000076wh
+      x-cache:
+      - CONFIG_NOCACHE
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      If-Match:
+      - '*'
+      User-Agent:
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFMzk5Q0Q2NzJDXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFNzMzOTlDRDVFXCIsXCJtYXhcIjpcIjA1QzFFOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureContainer","name":"clitestkja3kcndso56yykdv
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestkja3kcndso56yykdv"}],"isModularPublishing":true,"id":"22931ab4-7564-429d-994a-5f644173f86a"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFNzMzOTlDRDVFXCIsXCJtYXhcIjpcIjA1QzFFOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"SoftwareAsAService","name":"bobjacsaas1","externalIDs":[{"type":"AzureOfferId","value":"bobjacsaas1"}],"isModularPublishing":true,"id":"60d402fa-4d97-4359-9e48-7b4aecbfca74"},{"resourceType":"AzureApplication","name":"complexterraform2","externalIDs":[{"type":"AzureOfferId","value":"complexterraform2"}],"isModularPublishing":true,"id":"f1f1e4f5-ba96-4722-b4f7-760ff13b0cbb"},{"resourceType":"AzureApplication","name":"clitestz7ghjq4dsierimn3n
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestz7ghjq4dsierimn3n"}],"isModularPublishing":true,"id":"d12d2ea1-1fe4-4152-8b5e-c7ab22b70c7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:17 GMT
+      - Fri, 18 Apr 2025 15:34:52 GMT
       request-id:
-      - 4cf93617-5056-4f48-8289-ed49c86d4e26
+      - 0765fea8-b8cc-41c9-a432-917ec982e2a8
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rT+gZQAAAACF08O7uni6S7/gstXPJW8ZTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153452Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000076yk
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -434,25 +627,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFNzMzOTlDRDVFXCIsXCJtYXhcIjpcIjA1QzFFOUNENjczMzkwXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm-96","externalIDs":[{"type":"AzureOfferId","value":"modm-96"}],"isModularPublishing":true,"id":"891bb189-5099-46ad-937c-9436c5de67f7"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"modm-96","externalIDs":[{"type":"AzureOfferId","value":"modm-96"}],"isModularPublishing":true,"id":"891bb189-5099-46ad-937c-9436c5de67f7"},{"resourceType":"AzureContainer","name":"clitest2x2ucxm3gi4mccu2t","externalIDs":[{"type":"AzureOfferId","value":"clitest2x2ucxm3gi4mccu2t"}],"isModularPublishing":true,"id":"c642e91d-0047-4832-9761-4fa2fd9bd7a3"},{"resourceType":"AzureApplication","name":"simpleterraform","externalIDs":[{"type":"AzureOfferId","value":"simpleterraform"}],"isModularPublishing":true,"id":"ce5875c6-5062-4391-a315-99dea3d3d8b8"},{"resourceType":"AzureApplication","name":"complexterraform","externalIDs":[{"type":"AzureOfferId","value":"complexterraform"}],"isModularPublishing":true,"id":"1ede1147-20da-4adc-88eb-1d576332ed47"},{"resourceType":"AzureApplication","name":"bobjacapitest2","externalIDs":[{"type":"AzureOfferId","value":"bobjacapitest2"}],"isModularPublishing":true,"id":"246aed98-915f-4706-b0e8-6d8f2a9a8fdc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:17 GMT
+      - Fri, 18 Apr 2025 15:34:52 GMT
       request-id:
-      - 51ba7f21-ae25-4a22-a9f0-a8eb91d16c73
+      - b3a828ab-9102-4411-903a-8ff93e24eead
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rT+gZQAAAADZXlWopcggSpPYyWI2wQb3TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153453Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000771h
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -466,26 +659,58 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFOUNENjczMzkwXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"clitestmbztczfkqavmexvga
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitestmbztczfkqavmexvga"}],"isModularPublishing":true,"id":"3d153867-3c20-40b6-9ef2-0b3feac74a49"}]}'
+      string: '{"nextLink":"v1.0/ingestion/products?$skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFRDY3MzM5OUMyXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9","value":[{"resourceType":"AzureApplication","name":"bobjennytestnoplan","externalIDs":[{"type":"AzureOfferId","value":"bobjennytestnoplan"}],"isModularPublishing":true,"id":"2a81d504-e0ea-442f-897c-10b87fd42578"},{"resourceType":"AzureApplication","name":"bobjennytest5","externalIDs":[{"type":"AzureOfferId","value":"bobjennytest5"}],"isModularPublishing":true,"id":"ae7ed961-493e-42d6-9e6a-0d81d600186a"},{"resourceType":"AzureThirdPartyVirtualMachine","name":"kehillivm20250418","externalIDs":[{"type":"AzureOfferId","value":"kehillivm20250418"}],"isModularPublishing":true,"id":"99b578c2-bf71-4b5f-b326-1d93c3a7a0b7"}]}'
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 18 Apr 2025 15:34:53 GMT
+      request-id:
+      - 76bd411b-bd22-429c-aecb-970af27ee9bb
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      x-azure-ref:
+      - 20250418T153453Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007743
+      x-cache:
+      - CONFIG_NOCACHE
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      If-Match:
+      - '*'
+      User-Agent:
+      - AzureCLI-PCExt/0.2.6
+    method: GET
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24skipToken=eyJMYXN0SWQiOiJbe1widG9rZW5cIjpudWxsLFwicmFuZ2VcIjp7XCJtaW5cIjpcIjA1QzFFRDY3MzM5OUMyXCIsXCJtYXhcIjpcIkZGXCJ9fV0iLCJTb3VyY2UiOiJEb2NEQiJ9
+  response:
+    body:
+      string: '{"value":[{"resourceType":"AzureApplication","name":"simplebicep","externalIDs":[{"type":"AzureOfferId","value":"simplebicep"}],"isModularPublishing":true,"id":"b1d5db4c-a7af-423a-b202-238ef4a41198"},{"resourceType":"AzureContainer","name":"clitesteh5b4gi2m5s4h5mfr
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitesteh5b4gi2m5s4h5mfr"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:17 GMT
+      - Fri, 18 Apr 2025 15:34:53 GMT
       request-id:
-      - 4ad430f7-2cd5-41e8-9bf0-63bc85005125
+      - 7ac8b0bb-dd00-4e97-901d-d79752c07afc
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rT+gZQAAAACc7bdvvbHDSopNqksk8rX+TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153453Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000776a
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing.yaml
index debac5d8..16ffac40 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing.yaml
@@ -7,25 +7,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000004%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"b0b29cef-02cb-4ea4-8d01-024282b7574c"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"f626bb70-637a-4638-b908-43c8abf8b9f8"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:39 GMT
       request-id:
-      - 28552d22-2a17-4ece-83fa-de1d6345b4e0
+      - efc57533-2cd7-4e13-84e8-f8e799dbcf72
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iT+gZQAAAABpUnnGoNf/SqOAxx9q8DhqTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153439Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000xzwm
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -39,25 +39,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"938e9704-587b-0199-5d56-3c1f2ab30251"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"3b25cf62-4d96-7e20-fb60-6d9eaabcceba"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:39 GMT
       request-id:
-      - 3d874257-3c40-4081-a35c-40d9b1ddb229
+      - 22eebc4b-534b-4d8b-bef1-d72ef38be35f
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iT+gZQAAAADChxcmuvosR48lgBLMh3puTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153439Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f8dn
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -71,26 +71,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/listings/getByInstanceID(instanceID=938e9704-587b-0199-5d56-3c1f2ab30251)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/listings/getByInstanceID(instanceID=3b25cf62-4d96-7e20-fb60-6d9eaabcceba)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000004
-        Alias","keywords":[],"@odata.etag":"\"6b00467d-0000-0800-0000-65a03f860000\"","id":"415dc49e-a024-0d06-1b12-06c52374ab5f"}]}'
+        Alias","keywords":[],"@odata.etag":"\"3502af32-0000-0800-0000-6802710c0000\"","id":"56512177-444d-19d4-8bc8-8e72d7e04ed0"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:39 GMT
       request-id:
-      - 3c984c64-026b-42c8-8123-e80c847fcc30
+      - 21931e4f-2b6a-4ca4-8a6d-1c6b52359861
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAAD/O89Bk0R6TJKM8DZ3ERmoTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153440Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f8hp
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -104,25 +104,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000004%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"b0b29cef-02cb-4ea4-8d01-024282b7574c"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"f626bb70-637a-4638-b908-43c8abf8b9f8"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - 6f098594-537b-4c5b-852b-8b83894e006b
+      - 4cd986e7-60e7-4226-8c4e-9e1540b83b0e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAACENmpzl4uXS4DQoLn8yA+TTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153440Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014w4x
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -136,25 +136,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"938e9704-587b-0199-5d56-3c1f2ab30251"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"3b25cf62-4d96-7e20-fb60-6d9eaabcceba"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - e3a10612-0f0c-4d0c-8c52-c46ececb11c5
+      - e6d4930b-d664-485a-9062-611a40064f57
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAAB+suvTzwh7R6pWjOzn5RdBTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153441Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000073v0
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -168,26 +168,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/listings/getByInstanceID(instanceID=938e9704-587b-0199-5d56-3c1f2ab30251)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/listings/getByInstanceID(instanceID=3b25cf62-4d96-7e20-fb60-6d9eaabcceba)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000004
-        Alias","keywords":[],"@odata.etag":"\"6b00467d-0000-0800-0000-65a03f860000\"","id":"415dc49e-a024-0d06-1b12-06c52374ab5f"}]}'
+        Alias","keywords":[],"@odata.etag":"\"3502af32-0000-0800-0000-6802710c0000\"","id":"56512177-444d-19d4-8bc8-8e72d7e04ed0"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - 1605f37b-4db9-43e6-b672-a3c32f60da0d
+      - 447c0290-743c-4552-a874-4c0a11baf344
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iz+gZQAAAAABVD7d5Y6jRpRHLmjUhPZVTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153441Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000073wu
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -201,25 +201,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000004%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"b0b29cef-02cb-4ea4-8d01-024282b7574c"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"f626bb70-637a-4638-b908-43c8abf8b9f8"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - f370382a-35f4-445d-8756-af1b15ea0b82
+      - f519e7e1-21c0-43bc-8b8a-5c32bf4c6808
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iz+gZQAAAABPBiXmS7oeQoZYcrv6XxB5TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f92k
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -233,25 +233,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000004%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"b0b29cef-02cb-4ea4-8d01-024282b7574c"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"f626bb70-637a-4638-b908-43c8abf8b9f8"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - e90970e7-fad6-46ef-92a2-bc89f6d37c96
+      - 73db84a7-6bc4-426b-a659-730ffc22f5b6
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAACfNEbEh1DTTp5r/63Mkd9ATU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-16b6fd4df76j9l2phC1BL1b85g0000000aqg0000000172h3
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -265,25 +265,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"938e9704-587b-0199-5d56-3c1f2ab30251"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"3b25cf62-4d96-7e20-fb60-6d9eaabcceba"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 2509424b-040d-47c8-a596-957674bbecc1
+      - 56e08ffa-cc65-49ba-8644-a54a8e80e8da
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAAD/DGhPECSlQY1J4N0Qnbv0TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f998
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -297,26 +297,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/listings/getByInstanceID(instanceID=938e9704-587b-0199-5d56-3c1f2ab30251)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/listings/getByInstanceID(instanceID=3b25cf62-4d96-7e20-fb60-6d9eaabcceba)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000004
-        Alias","keywords":[],"@odata.etag":"\"6b00467d-0000-0800-0000-65a03f860000\"","id":"415dc49e-a024-0d06-1b12-06c52374ab5f"}]}'
+        Alias","keywords":[],"@odata.etag":"\"3502af32-0000-0800-0000-6802710c0000\"","id":"56512177-444d-19d4-8bc8-8e72d7e04ed0"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:44 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 5bb7f38f-d483-43f2-8d40-655ed6e0cb69
+      - 0cd2caf3-fb68-4b2a-ad65-5addfe896dbf
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAAAlyw7unECySawGGSavxT6ZTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153443Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000f9ap
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -325,7 +325,7 @@ interactions:
 - request:
     body: '{"resourceType": "AzureListing", "description": "desc-000003", "title":
       "clitest000004 Alias", "summary": "summary-000001", "shortDescription": "short-desc-000002",
-      "@odata.etag": "\"6b00467d-0000-0800-0000-65a03f860000\"", "listingUris": [],
+      "@odata.etag": "\"3502af32-0000-0800-0000-6802710c0000\"", "listingUris": [],
       "listingContacts": []}'
     headers:
       Accept:
@@ -335,28 +335,28 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/listings/415dc49e-a024-0d06-1b12-06c52374ab5f
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/listings/56512177-444d-19d4-8bc8-8e72d7e04ed0
   response:
     body:
       string: '{"resourceType":"AzureListing","summary":"summary-000001","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000004
-        Alias","description":"desc-000003","shortDescription":"short-desc-000002","@odata.etag":"\"6b00547f-0000-0800-0000-65a03f8d0000\"","id":"415dc49e-a024-0d06-1b12-06c52374ab5f"}'
+        Alias","description":"desc-000003","shortDescription":"short-desc-000002","@odata.etag":"\"35021a34-0000-0800-0000-680271130000\"","id":"56512177-444d-19d4-8bc8-8e72d7e04ed0"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:44 GMT
+      - Fri, 18 Apr 2025 15:34:43 GMT
       etag:
-      - '"6b00547f-0000-0800-0000-65a03f8d0000"'
+      - '"35021a34-0000-0800-0000-680271130000"'
       request-id:
-      - 9e5258c3-3bea-44ec-8d1f-06ce235a4db5
+      - 64b97786-5678-44f4-89b1-f957f1c8f0a6
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jT+gZQAAAADeErGh8kb7T7Y+DxbL/qKdTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153443Z-16b6fd4df76j9l2phC1BL1b85g0000000aqg0000000172sd
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -370,25 +370,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000004%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"b0b29cef-02cb-4ea4-8d01-024282b7574c"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000004 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000004"}],"isModularPublishing":true,"id":"f626bb70-637a-4638-b908-43c8abf8b9f8"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:50 GMT
+      - Fri, 18 Apr 2025 15:34:48 GMT
       request-id:
-      - 3934cb94-3384-4e8a-b628-e2f9c229670f
+      - 7fc75b5e-8f98-4baf-8dc3-d0c6ed5f8c65
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kz+gZQAAAACT3GasJHcWQ7i3T2copm/KTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153449Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y2m9
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -402,25 +402,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"938e9704-587b-0199-5d56-3c1f2ab30251"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"3b25cf62-4d96-7e20-fb60-6d9eaabcceba"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:50 GMT
+      - Fri, 18 Apr 2025 15:34:49 GMT
       request-id:
-      - 254ebe01-95e8-4c23-9ca9-ce8c76ac7d6a
+      - f7e5abda-4f76-4581-ae3f-b0f549ebc1c3
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kz+gZQAAAAAEvXZupyvLQbZsZf3xKSqhTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153449Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y2nv
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -434,26 +434,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/b0b29cef-02cb-4ea4-8d01-024282b7574c/listings/getByInstanceID(instanceID=938e9704-587b-0199-5d56-3c1f2ab30251)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f626bb70-637a-4638-b908-43c8abf8b9f8/listings/getByInstanceID(instanceID=3b25cf62-4d96-7e20-fb60-6d9eaabcceba)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","summary":"summary-000001","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000004
-        Alias","description":"desc-000003","shortDescription":"short-desc-000002","@odata.etag":"\"6b00547f-0000-0800-0000-65a03f8d0000\"","id":"415dc49e-a024-0d06-1b12-06c52374ab5f"}]}'
+        Alias","description":"desc-000003","shortDescription":"short-desc-000002","@odata.etag":"\"35021a34-0000-0800-0000-680271130000\"","id":"56512177-444d-19d4-8bc8-8e72d7e04ed0"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:51 GMT
+      - Fri, 18 Apr 2025 15:34:49 GMT
       request-id:
-      - 3815f021-d8b0-4fd2-85ff-24ea8aed5668
+      - d56a1133-96c7-4673-9975-cc10413403fc
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kz+gZQAAAABP9LWB08t6QaMFI5jP99l5TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153449Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y2qv
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_contact.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_contact.yaml
index c24eafb5..e18d9240 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_contact.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_contact.yaml
@@ -7,25 +7,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:34:44 GMT
       request-id:
-      - 5a763890-a1fd-4acf-b120-bf4e0ba72330
+      - 15c105f1-30dc-4a52-a61c-51fc217ab8fe
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAABtDk+AlVo3RqqjENUrscpNTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-15bd8fcd597f55l8hC1BL1qttn0000000ab000000001akk7
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -39,25 +39,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"388794fd-952c-78a8-dd3b-2355c538d85c"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e83d8de2-2a42-e372-1092-6a2cfcfb51c2"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:34:44 GMT
       request-id:
-      - 2534f5ac-991f-47d3-b3f1-d4d450ffafdf
+      - 59f25f39-f3a5-4ee1-b326-e240aa88b4c0
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAACZCH6t8X9ZRaqEASJ67afTTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y1py
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -71,26 +71,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/getByInstanceID(instanceID=388794fd-952c-78a8-dd3b-2355c538d85c)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/getByInstanceID(instanceID=e83d8de2-2a42-e372-1092-6a2cfcfb51c2)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"0300ff9a-0000-0800-0000-65a03f850000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}]}'
+        Alias","keywords":[],"@odata.etag":"\"1a035fc0-0000-0800-0000-6802710d0000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - c82baed6-ce33-4f9f-85a1-299617e1f7a5
+      - 0c3af84d-6aac-4d41-9a85-a730da316db3
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jz+gZQAAAAB4qq/clcqzTpHMiT8aqpEWTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y1qv
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -104,25 +104,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - ce21b3a3-1d32-407e-a444-b4d52446d8f0
+      - ee749817-33b0-4b96-82e9-43be491b7e8a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jz+gZQAAAAAsHJ1RIztwR4pvUUejkxkSTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fa8e
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -136,25 +136,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"388794fd-952c-78a8-dd3b-2355c538d85c"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e83d8de2-2a42-e372-1092-6a2cfcfb51c2"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - 1d79a9b4-5922-449c-8797-27d9d127e68a
+      - 5ee1d08a-65ce-4935-a5f4-6aff8387ee1d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kD+gZQAAAAAomWbkHC/jTrQzxBkFwpFbTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y1x9
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -168,26 +168,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/getByInstanceID(instanceID=388794fd-952c-78a8-dd3b-2355c538d85c)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/getByInstanceID(instanceID=e83d8de2-2a42-e372-1092-6a2cfcfb51c2)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"0300ff9a-0000-0800-0000-65a03f850000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}]}'
+        Alias","keywords":[],"@odata.etag":"\"1a035fc0-0000-0800-0000-6802710d0000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - 546af177-ff9d-4c55-a545-1997cce15090
+      - d7543e02-efc9-4e66-a2b5-a670cb42af74
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kD+gZQAAAABQNYvfEuWERq2LQ+exZqyNTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fac9
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -201,25 +201,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - cbdbd172-e9e7-447d-958d-75960872ecca
+      - 5a01a3d4-653c-4549-bef7-87dacc0ac6e2
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kD+gZQAAAABRon0hbBAnTK9C1VWk8KyKTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153447Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y21d
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -233,25 +233,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - c9c228bb-266a-43a7-951d-b79c551c9b25
+      - 66e769fc-8064-470f-a406-90b22f217c13
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kT+gZQAAAABUFEJ37TxGQ5z7DBnfuWMxTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153447Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y24p
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -265,25 +265,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"388794fd-952c-78a8-dd3b-2355c538d85c"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e83d8de2-2a42-e372-1092-6a2cfcfb51c2"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - 5f2eb553-27f1-47a4-922c-aba61214b9ab
+      - a8251f28-b713-47f7-87f5-c98c3a9d7f5b
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kT+gZQAAAACADiUOPYpjSpK0fj3gvGoCTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153448Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y293
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -297,26 +297,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/getByInstanceID(instanceID=388794fd-952c-78a8-dd3b-2355c538d85c)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/getByInstanceID(instanceID=e83d8de2-2a42-e372-1092-6a2cfcfb51c2)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"0300ff9a-0000-0800-0000-65a03f850000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}]}'
+        Alias","keywords":[],"@odata.etag":"\"1a035fc0-0000-0800-0000-6802710d0000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - 8433df76-a4a6-4f6e-b815-46b5a1c2ee4f
+      - d422a7c7-280f-4e41-a77f-e49844f25a79
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kT+gZQAAAACIAdTXviyvSoOHLZ/iR/ONTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153448Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y2aq
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -324,7 +324,7 @@ interactions:
       message: OK
 - request:
     body: '{"resourceType": "AzureListing", "description": "", "title": "clitest000002
-      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"0300ff9a-0000-0800-0000-65a03f850000\"",
+      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"1a035fc0-0000-0800-0000-6802710d0000\"",
       "listingUris": [], "listingContacts": [{"type": "Engineering", "email": "test@contoso.com",
       "name": "Jane Doe000001", "phone": "1230987654", "uri": "https://test.contact.uri"}]}'
     headers:
@@ -335,29 +335,29 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/0413c9cd-14c1-6969-7e11-be75d81dfdd9
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/cdcee0b2-e1fc-0634-667e-aa1f18a91892
   response:
     body:
       string: '{"resourceType":"AzureListing","summary":"","listingUris":[],"listingContacts":[{"type":"Engineering","email":"test@contoso.com","name":"Jane
         Doe000001","phone":"1230987654","uri":"https://test.contact.uri"}],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"03001d9b-0000-0800-0000-65a03f920000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"1a0342c3-0000-0800-0000-680271180000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
+      - Fri, 18 Apr 2025 15:34:48 GMT
       etag:
-      - '"03001d9b-0000-0800-0000-65a03f920000"'
+      - '"1a0342c3-0000-0800-0000-680271180000"'
       request-id:
-      - f39a076e-afdb-4ed6-8c65-825af10344d8
+      - 825d0dec-358d-4584-a923-864802667c53
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kj+gZQAAAADmoaCVH3PnRYqPUM0hZ1DpTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153448Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014y7e
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -371,25 +371,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:56 GMT
+      - Fri, 18 Apr 2025 15:34:53 GMT
       request-id:
-      - 86999d25-e383-4e02-9136-91da3cefe1af
+      - b7871b54-805e-473d-9f9c-82d2f188b69d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0lz+gZQAAAADXlCd4aC3hQKkMYHz+sEVGTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153454Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fc76
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -403,25 +403,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"388794fd-952c-78a8-dd3b-2355c538d85c"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e83d8de2-2a42-e372-1092-6a2cfcfb51c2"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:56 GMT
+      - Fri, 18 Apr 2025 15:34:54 GMT
       request-id:
-      - 2d92692f-f1e9-494d-bee3-bd1a170affc9
+      - b998c1c8-e1fa-4eb6-acb1-57927e2d4779
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mD+gZQAAAABGs1qvbjrYTrFkrTFi+O74TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153454Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fcbx
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -435,27 +435,27 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/getByInstanceID(instanceID=388794fd-952c-78a8-dd3b-2355c538d85c)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/getByInstanceID(instanceID=e83d8de2-2a42-e372-1092-6a2cfcfb51c2)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","summary":"","listingUris":[],"listingContacts":[{"type":"Engineering","email":"test@contoso.com","name":"Jane
         Doe000001","phone":"1230987654","uri":"https://test.contact.uri"}],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"03001d9b-0000-0800-0000-65a03f920000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}]}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"1a0342c3-0000-0800-0000-680271180000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:56 GMT
+      - Fri, 18 Apr 2025 15:34:54 GMT
       request-id:
-      - 18325981-58ba-4000-91f3-9ff3700238b6
+      - a476c386-7523-47e1-b833-fae379de7521
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mD+gZQAAAADvz0k1wITPTZC4Pw8535ebTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153455Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fchd
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -469,25 +469,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:56 GMT
+      - Fri, 18 Apr 2025 15:34:54 GMT
       request-id:
-      - ce54b7a3-3ca2-4e2a-b615-06a68e45d282
+      - 72ad7c83-e237-42a6-a8c5-46f6b1da61e8
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mD+gZQAAAACZpVBJy1jZQrdRqwTHuUaKTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153455Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fckr
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -501,25 +501,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:57 GMT
+      - Fri, 18 Apr 2025 15:34:55 GMT
       request-id:
-      - 86d2232d-db6b-4958-82d1-526abcabef34
+      - 6a6b3871-6bd4-440a-8b4d-5dcd1b5f1a40
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mT+gZQAAAAC/vNpGKF7WQYk1Adifc6DITU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153455Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fcpq
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -533,25 +533,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"388794fd-952c-78a8-dd3b-2355c538d85c"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e83d8de2-2a42-e372-1092-6a2cfcfb51c2"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:57 GMT
+      - Fri, 18 Apr 2025 15:34:55 GMT
       request-id:
-      - 0d13394b-5281-4f74-ab9c-072feda54044
+      - 8c4e2f92-066b-4977-968c-2c63c3437371
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mT+gZQAAAAD+yQwj71ebTq9VDicSQy3DTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153456Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fcsz
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -565,27 +565,27 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/getByInstanceID(instanceID=388794fd-952c-78a8-dd3b-2355c538d85c)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/getByInstanceID(instanceID=e83d8de2-2a42-e372-1092-6a2cfcfb51c2)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","summary":"","listingUris":[],"listingContacts":[{"type":"Engineering","email":"test@contoso.com","name":"Jane
         Doe000001","phone":"1230987654","uri":"https://test.contact.uri"}],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"03001d9b-0000-0800-0000-65a03f920000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}]}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"1a0342c3-0000-0800-0000-680271180000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:57 GMT
+      - Fri, 18 Apr 2025 15:34:55 GMT
       request-id:
-      - 55fa452f-8613-45b0-9225-9b9ef633e628
+      - 92076966-b127-4263-890c-11004e69c134
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mT+gZQAAAAAOP5GRupR4QpNbBK94BIcaTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153456Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y4kq
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -593,7 +593,7 @@ interactions:
       message: OK
 - request:
     body: '{"resourceType": "AzureListing", "description": "", "title": "clitest000002
-      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"03001d9b-0000-0800-0000-65a03f920000\"",
+      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"1a0342c3-0000-0800-0000-680271180000\"",
       "listingUris": [], "listingContacts": []}'
     headers:
       Accept:
@@ -603,28 +603,28 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/0413c9cd-14c1-6969-7e11-be75d81dfdd9
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/cdcee0b2-e1fc-0634-667e-aa1f18a91892
   response:
     body:
       string: '{"resourceType":"AzureListing","summary":"","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"0300259b-0000-0800-0000-65a03f9a0000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"1a03e3c5-0000-0800-0000-680271200000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:58 GMT
+      - Fri, 18 Apr 2025 15:34:57 GMT
       etag:
-      - '"0300259b-0000-0800-0000-65a03f9a0000"'
+      - '"1a03e3c5-0000-0800-0000-680271200000"'
       request-id:
-      - 56f07b3b-e1a6-4540-b718-7dfbc5490205
+      - 34d1cef4-3e3a-4af3-b343-1bf6d1476cc2
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mj+gZQAAAAAa1L/Xf4DHQIn+ILjM2jl0TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153456Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y4q3
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -638,25 +638,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a74088c6-fa74-4c2f-8114-a228cece1b15"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:35:02 GMT
       request-id:
-      - 73ac4ed2-d73b-4df0-99fb-968331af4fcd
+      - 8521d47e-4be6-4f56-bbcc-a8886e02fe0f
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAAC/LZUvFhbTSL3+n76bxE1LTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153502Z-16b6fd4df76g488nhC1BL1pewn00000009hg0000000151gc
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -670,25 +670,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"388794fd-952c-78a8-dd3b-2355c538d85c"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e83d8de2-2a42-e372-1092-6a2cfcfb51c2"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:04 GMT
+      - Fri, 18 Apr 2025 15:35:02 GMT
       request-id:
-      - c138c2c2-6f44-429e-9e2c-4dc5ad5745d5
+      - 5b1dbe6f-de89-4d7c-9f2f-7debee32c6b3
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAAAKoMYLl3GlR4t3nqKqiTsLTU5aMjIxMDYwNjEzMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153502Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000079en
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -702,26 +702,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a74088c6-fa74-4c2f-8114-a228cece1b15/listings/getByInstanceID(instanceID=388794fd-952c-78a8-dd3b-2355c538d85c)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/f5cf4433-f3b6-47f5-a8b8-dbe6025e50b6/listings/getByInstanceID(instanceID=e83d8de2-2a42-e372-1092-6a2cfcfb51c2)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","summary":"","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"0300259b-0000-0800-0000-65a03f9a0000\"","id":"0413c9cd-14c1-6969-7e11-be75d81dfdd9"}]}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"1a03e3c5-0000-0800-0000-680271200000\"","id":"cdcee0b2-e1fc-0634-667e-aa1f18a91892"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:04 GMT
+      - Fri, 18 Apr 2025 15:35:02 GMT
       request-id:
-      - 10270fd6-0cb2-476f-b076-20c329b1e217
+      - 10a86329-9404-45ed-b4f6-8d5257b0bde7
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAAAoTBFvPdUsRo+yzodQXH0/TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153503Z-16b6fd4df76g488nhC1BL1pewn00000009hg0000000151qa
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_uri.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_uri.yaml
index 4bcc4430..d6deae89 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_uri.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_listing_uri.yaml
@@ -7,25 +7,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - 64a2c6b2-72b7-4582-aa15-f4dbbe03e2c3
+      - 2d7d74e8-a995-444d-ad69-b09901e783fc
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAAB5dbLBs/XMTJH7f6+hywv5TU5aMjIxMDYwNjEzMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074wy
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -39,25 +39,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"0bfb8a6c-3940-62a9-7d16-77e62bce815d"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7fe9b16b-4681-edbb-edef-40ec320ae1b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - 5ba2fdf5-6927-4ef2-a034-e1c48d95963b
+      - 581db7e8-2dee-414b-be88-586fce654bdb
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAADTemUfu4OtQrExc8gSETC/TU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074z2
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -71,26 +71,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/getByInstanceID(instanceID=0bfb8a6c-3940-62a9-7d16-77e62bce815d)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/getByInstanceID(instanceID=7fe9b16b-4681-edbb-edef-40ec320ae1b6)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"2c002fa3-0000-0800-0000-65a03f850000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}]}'
+        Alias","keywords":[],"@odata.etag":"\"3f0355ca-0000-0800-0000-6802710c0000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - ca5022ef-1b4b-4ee9-b29a-5daee8a2478e
+      - 522650c6-1a3e-423d-8cf4-56ebbcac90de
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAAC8Yez03ngyRJbZ4oQsH82ETU5aMjIxMDYwNjEzMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000750p
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -104,25 +104,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
+      - Fri, 18 Apr 2025 15:34:46 GMT
       request-id:
-      - bde9ed26-e18b-48c1-83b7-14fc77d5b09f
+      - 85abd4ab-33e9-448f-849e-ec00c9cb3ac3
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jz+gZQAAAADi+nw0X3TGSp4FMwE1fDNHTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014xkt
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -136,25 +136,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"0bfb8a6c-3940-62a9-7d16-77e62bce815d"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7fe9b16b-4681-edbb-edef-40ec320ae1b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
+      - Fri, 18 Apr 2025 15:34:46 GMT
       request-id:
-      - d45f4680-6b51-45f8-93b3-7a7085129329
+      - f1cc9c07-1792-4e68-ab25-47c9c70a77f9
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jz+gZQAAAADI69lFoLO/SqqGU5VCP+iJTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014xqp
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -168,26 +168,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/getByInstanceID(instanceID=0bfb8a6c-3940-62a9-7d16-77e62bce815d)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/getByInstanceID(instanceID=7fe9b16b-4681-edbb-edef-40ec320ae1b6)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"2c002fa3-0000-0800-0000-65a03f850000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}]}'
+        Alias","keywords":[],"@odata.etag":"\"3f0355ca-0000-0800-0000-6802710c0000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
+      - Fri, 18 Apr 2025 15:34:46 GMT
       request-id:
-      - 55df8bc9-351f-4021-8d65-977357af5112
+      - 2252fdad-f639-4adf-904c-970a78905573
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kD+gZQAAAAAc9XM5biRjQrAVJWvyZkunTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014xs1
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -201,25 +201,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:46 GMT
       request-id:
-      - 6b57035e-c1c0-417a-ab57-6ff90a783734
+      - 4961aea4-8306-4790-8130-e43e5b255ee6
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kD+gZQAAAADcMZzp+SEMR7fF6MysXNoeTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014xtw
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -233,25 +233,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - 8db12149-238e-4540-bff2-727030c81123
+      - f163faa4-28a7-4953-b3c2-5d70469675d2
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kD+gZQAAAACJdqTTxqCoSKQV7SGOB36YTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153447Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000075fu
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -265,25 +265,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"0bfb8a6c-3940-62a9-7d16-77e62bce815d"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7fe9b16b-4681-edbb-edef-40ec320ae1b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - 9c8938d5-617e-4e1d-8e19-4d9e88dee8b3
+      - d2730745-0038-486f-9620-2288a8a0ce7b
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kT+gZQAAAABBSFS0BkEvTY/vGdY7jxk/TU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153447Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000075hs
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -297,26 +297,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/getByInstanceID(instanceID=0bfb8a6c-3940-62a9-7d16-77e62bce815d)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/getByInstanceID(instanceID=7fe9b16b-4681-edbb-edef-40ec320ae1b6)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"2c002fa3-0000-0800-0000-65a03f850000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}]}'
+        Alias","keywords":[],"@odata.etag":"\"3f0355ca-0000-0800-0000-6802710c0000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
+      - Fri, 18 Apr 2025 15:34:47 GMT
       request-id:
-      - b19b6a5a-a74b-41a6-a401-135384b9b6d4
+      - 5d9fafcd-8e3c-4f74-ae3f-76549f678648
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kT+gZQAAAAA3FqMQAJ/bTqL/3MzYxgrGTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153447Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000075mf
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -324,7 +324,7 @@ interactions:
       message: OK
 - request:
     body: '{"resourceType": "AzureListing", "description": "", "title": "clitest000002
-      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"2c002fa3-0000-0800-0000-65a03f850000\"",
+      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"3f0355ca-0000-0800-0000-6802710c0000\"",
       "listingUris": [{"type": "PrivacyUri", "subtype": "SubTypeUri", "displayText":
       "dt-000001", "uri": "https://testuri"}], "listingContacts": []}'
     headers:
@@ -335,28 +335,28 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/4be52c95-c16b-bf92-7144-0d97aba1781c
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/bb5c11bd-17dd-adb4-4aa4-2c207c1f3240
   response:
     body:
       string: '{"resourceType":"AzureListing","summary":"","listingUris":[{"type":"PrivacyUri","subtype":"SubTypeUri","displayText":"dt-000001","uri":"https://testuri"}],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"2c00b5a3-0000-0800-0000-65a03f910000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"3f03a0cd-0000-0800-0000-680271180000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
+      - Fri, 18 Apr 2025 15:34:48 GMT
       etag:
-      - '"2c00b5a3-0000-0800-0000-65a03f910000"'
+      - '"3f03a0cd-0000-0800-0000-680271180000"'
       request-id:
-      - 6f41c2b4-bbe9-44e8-b0a6-18d9a6b6e785
+      - 55f7a361-96cc-47ab-a78c-b06b638614f3
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kT+gZQAAAADgcULnXDerTIQY90OW5lK1TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153448Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000075pc
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -370,25 +370,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:55 GMT
+      - Fri, 18 Apr 2025 15:34:53 GMT
       request-id:
-      - d1cb1ef2-681e-4cfb-a88b-813c569d08bc
+      - 4cf829f2-60c0-494e-bb20-f0e715ead58b
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0lz+gZQAAAAAPpAYODiKZT5pXLxxTc9abTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153453Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y3us
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -402,25 +402,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"0bfb8a6c-3940-62a9-7d16-77e62bce815d"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7fe9b16b-4681-edbb-edef-40ec320ae1b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:55 GMT
+      - Fri, 18 Apr 2025 15:34:53 GMT
       request-id:
-      - 0811e29a-bc10-47e8-b790-0d2321cc4ca9
+      - 409aa66e-742d-4a69-83da-485b00a3a7a9
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0lz+gZQAAAADbl4nrD811SalhKBH9rOGUTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153454Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y3x1
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -434,26 +434,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/getByInstanceID(instanceID=0bfb8a6c-3940-62a9-7d16-77e62bce815d)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/getByInstanceID(instanceID=7fe9b16b-4681-edbb-edef-40ec320ae1b6)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","summary":"","listingUris":[{"type":"PrivacyUri","subtype":"SubTypeUri","displayText":"dt-000001","uri":"https://testuri"}],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"2c00b5a3-0000-0800-0000-65a03f910000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}]}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"3f03a0cd-0000-0800-0000-680271180000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:55 GMT
+      - Fri, 18 Apr 2025 15:34:53 GMT
       request-id:
-      - 4b4cf91a-1370-4734-a7d0-fc8a3b746a9c
+      - 702a1bdc-012a-4d68-af7e-c1ad36ec58b9
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mD+gZQAAAABKQDBmgZOhQb7FQckZdcqGTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153454Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y3yf
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -467,25 +467,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:55 GMT
+      - Fri, 18 Apr 2025 15:34:54 GMT
       request-id:
-      - 714763f0-cfb4-4fd3-a51e-c3b1afef84f6
+      - 47da5761-b127-4d78-a8a9-c8b0d4405190
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mD+gZQAAAADTuADiBZh7So6V0LrlBLKkTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153454Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y438
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -499,25 +499,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:56 GMT
+      - Fri, 18 Apr 2025 15:34:54 GMT
       request-id:
-      - fb1e3688-b8e0-4124-8f3a-569f208bb15f
+      - ea17ffea-c145-47af-b98b-3ce71c1ad9ad
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mD+gZQAAAAAyG30AwA/2Q49I8naTQP+aTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153455Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y464
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -531,25 +531,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"0bfb8a6c-3940-62a9-7d16-77e62bce815d"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7fe9b16b-4681-edbb-edef-40ec320ae1b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:56 GMT
+      - Fri, 18 Apr 2025 15:34:54 GMT
       request-id:
-      - c85d5b99-f0e4-491c-b72f-2ad110469a05
+      - 07045620-26d9-4d94-8e95-c580ee825493
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mT+gZQAAAACedOS1hz3zQpT6sWxCc7J8TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153455Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y4aq
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -563,26 +563,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/getByInstanceID(instanceID=0bfb8a6c-3940-62a9-7d16-77e62bce815d)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/getByInstanceID(instanceID=7fe9b16b-4681-edbb-edef-40ec320ae1b6)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","summary":"","listingUris":[{"type":"PrivacyUri","subtype":"SubTypeUri","displayText":"dt-000001","uri":"https://testuri"}],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"2c00b5a3-0000-0800-0000-65a03f910000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}]}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"3f03a0cd-0000-0800-0000-680271180000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:56 GMT
+      - Fri, 18 Apr 2025 15:34:54 GMT
       request-id:
-      - 6f1d72fe-80db-4559-8f91-3ea2738baa1f
+      - 331a847a-0544-4e5f-82fa-acc9cd5d82ac
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mT+gZQAAAABDmyR/7pEzRaCWzGFAEoneTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153455Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y4e4
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -590,7 +590,7 @@ interactions:
       message: OK
 - request:
     body: '{"resourceType": "AzureListing", "description": "", "title": "clitest000002
-      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"2c00b5a3-0000-0800-0000-65a03f910000\"",
+      Alias", "summary": "", "shortDescription": "", "@odata.etag": "\"3f03a0cd-0000-0800-0000-680271180000\"",
       "listingUris": [], "listingContacts": []}'
     headers:
       Accept:
@@ -600,28 +600,28 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/4be52c95-c16b-bf92-7144-0d97aba1781c
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/bb5c11bd-17dd-adb4-4aa4-2c207c1f3240
   response:
     body:
       string: '{"resourceType":"AzureListing","summary":"","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"2c0047a4-0000-0800-0000-65a03f990000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"3f03ecd1-0000-0800-0000-680271200000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:58 GMT
+      - Fri, 18 Apr 2025 15:34:56 GMT
       etag:
-      - '"2c0047a4-0000-0800-0000-65a03f990000"'
+      - '"3f03ecd1-0000-0800-0000-680271200000"'
       request-id:
-      - e9fccf98-e310-485f-a7b5-c4ccd8a9f16f
+      - 7f10a4a4-9f00-467b-954b-19e712d6159c
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mT+gZQAAAAD1twWqctG0T4n/ZTtGbd/QTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153456Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000077tm
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -635,25 +635,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"20880f47-d847-47c8-8a47-8557aade23c1"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0168442f-dcfd-4e3a-b1cf-767b01d87c58"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:35:02 GMT
       request-id:
-      - 0997cbfc-075b-40a5-8506-fa360fa8b25e
+      - 6e013c5e-7419-4260-9ea0-705252e82a7c
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAADpfMKh0pU2Qod47D1ozswOTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153502Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000798d
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -667,25 +667,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"0bfb8a6c-3940-62a9-7d16-77e62bce815d"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7fe9b16b-4681-edbb-edef-40ec320ae1b6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:35:02 GMT
       request-id:
-      - 4cfea7b7-41c6-4ae7-bb93-7034cb699b27
+      - 930d006e-08ba-4c8d-96d8-629a0ecb4be4
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAAAPGN4pS1q8S7M7l1iRWEuXTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153502Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000799s
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -699,26 +699,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/20880f47-d847-47c8-8a47-8557aade23c1/listings/getByInstanceID(instanceID=0bfb8a6c-3940-62a9-7d16-77e62bce815d)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0168442f-dcfd-4e3a-b1cf-767b01d87c58/listings/getByInstanceID(instanceID=7fe9b16b-4681-edbb-edef-40ec320ae1b6)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","summary":"","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
-        Alias","description":"","shortDescription":"","@odata.etag":"\"2c0047a4-0000-0800-0000-65a03f990000\"","id":"4be52c95-c16b-bf92-7144-0d97aba1781c"}]}'
+        Alias","description":"","shortDescription":"","@odata.etag":"\"3f03ecd1-0000-0800-0000-680271200000\"","id":"bb5c11bd-17dd-adb4-4aa4-2c207c1f3240"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:35:02 GMT
       request-id:
-      - bec09032-ae5d-43c7-ac21-7042a11694c3
+      - 772b5ab6-a597-4e4d-82be-40b731035bdd
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAAA8GMB2UqKKQJdRMQ7PIC0dTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153502Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000079bf
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan.yaml
index 5d77f43f..6a277523 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan.yaml
@@ -7,25 +7,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"22931ab4-7564-429d-994a-5f644173f86a"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"6bb30a9e-e37e-444c-96b8-57242cb0c85f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:23 GMT
+      - Fri, 18 Apr 2025 15:35:19 GMT
       request-id:
-      - 8d384336-8a9a-4b25-abe8-6dd05766b897
+      - bf1a39a6-cd69-42a9-8871-a16a7856d137
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sz+gZQAAAAB5sRaI+crdSpMa3ZHI1pPNTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153519Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007dds
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -42,30 +42,30 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/22931ab4-7564-429d-994a-5f644173f86a/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/6bb30a9e-e37e-444c-96b8-57242cb0c85f/variants
   response:
     body:
       string: '{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001
-        Friendly Name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"760178f1-0000-0800-0000-65a03fb40000\"","id":"07dee373-efd1-4d43-a203-7f1f227c147f"}'
+        Friendly Name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"53001bfd-0000-0800-0000-680271380000\"","id":"812e111b-3e61-4f44-bc18-eb8ed7ce5033"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:23 GMT
+      - Fri, 18 Apr 2025 15:35:20 GMT
       etag:
-      - '"760178f1-0000-0800-0000-65a03fb40000"'
+      - '"53001bfd-0000-0800-0000-680271380000"'
       location:
-      - https://api.partner.microsoft.com/v1.0/ingestion/products/22931ab4-7564-429d-994a-5f644173f86a/variants/07dee373-efd1-4d43-a203-7f1f227c147f
+      - https://api.partner.microsoft.com/v1.0/ingestion/products/6bb30a9e-e37e-444c-96b8-57242cb0c85f/variants/812e111b-3e61-4f44-bc18-eb8ed7ce5033
       request-id:
-      - 07dd770c-46ab-4cb9-8cee-0042ba1c3fb4
+      - 691dcaaa-b8ab-402f-bbc7-d239d8825e04
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sz+gZQAAAAArvvpLFWTyS56c1GHRfWEeTU5aMjIxMDYwNjEzMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153519Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000ycdc
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -79,25 +79,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"22931ab4-7564-429d-994a-5f644173f86a"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"6bb30a9e-e37e-444c-96b8-57242cb0c85f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:29 GMT
+      - Fri, 18 Apr 2025 15:35:26 GMT
       request-id:
-      - f8e78090-bab5-4e63-8a19-1a5b0f838477
+      - 6c69f029-3254-46d0-a70f-4aebc5c81dd6
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0uT+gZQAAAAC/1/I98qbQSIocXyqmw+o6TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153525Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000ye8n
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -111,26 +111,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/22931ab4-7564-429d-994a-5f644173f86a/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/6bb30a9e-e37e-444c-96b8-57242cb0c85f/variants
   response:
     body:
       string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001
-        Friendly Name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"760178f1-0000-0800-0000-65a03fb40000\"","id":"07dee373-efd1-4d43-a203-7f1f227c147f"}]}'
+        Friendly Name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"53001bfd-0000-0800-0000-680271380000\"","id":"812e111b-3e61-4f44-bc18-eb8ed7ce5033"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:29 GMT
+      - Fri, 18 Apr 2025 15:35:26 GMT
       request-id:
-      - de26ef56-10c7-4755-ac86-6037b34d1083
+      - 81ab062c-1ecb-4623-b588-2ec0c7fdd9af
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0uj+gZQAAAACtCSGA9RoER76FOhABnAY+TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153526Z-16b6fd4df76g488nhC1BL1pewn00000009hg0000000156t8
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -144,25 +144,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"22931ab4-7564-429d-994a-5f644173f86a"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"6bb30a9e-e37e-444c-96b8-57242cb0c85f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:35 GMT
+      - Fri, 18 Apr 2025 15:35:32 GMT
       request-id:
-      - 788d7088-d0a3-403b-a34e-95d6de299c7a
+      - 6ab76748-3c0b-4f34-a114-857db719935f
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0vz+gZQAAAAA6mv2cE1XxTZBHMQy2ak22TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153531Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007h38
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -176,25 +176,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"22931ab4-7564-429d-994a-5f644173f86a"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"6bb30a9e-e37e-444c-96b8-57242cb0c85f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:35 GMT
+      - Fri, 18 Apr 2025 15:35:32 GMT
       request-id:
-      - 7ee1d760-6229-4f3a-8b3d-9676cf7ca4f5
+      - 46f96a9a-4da1-4b86-b784-651cd0d1b8b1
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0wD+gZQAAAABodx+xRKBjQJNDeEQce02dTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153532Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007h75
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -208,26 +208,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/22931ab4-7564-429d-994a-5f644173f86a/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/6bb30a9e-e37e-444c-96b8-57242cb0c85f/variants
   response:
     body:
       string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001
-        Friendly Name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"760178f1-0000-0800-0000-65a03fb40000\"","id":"07dee373-efd1-4d43-a203-7f1f227c147f"}]}'
+        Friendly Name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"53001bfd-0000-0800-0000-680271380000\"","id":"812e111b-3e61-4f44-bc18-eb8ed7ce5033"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:36 GMT
+      - Fri, 18 Apr 2025 15:35:32 GMT
       request-id:
-      - 848054f1-c6d6-4129-bfcd-ff62e007a20a
+      - 230fc8b9-4940-4425-a161-78560f5170ca
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0wD+gZQAAAADtK4csuY+wS6hsxQTg9RR6TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153532Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000yg7v
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -241,9 +241,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: DELETE
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/22931ab4-7564-429d-994a-5f644173f86a/variants/07dee373-efd1-4d43-a203-7f1f227c147f
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/6bb30a9e-e37e-444c-96b8-57242cb0c85f/variants/812e111b-3e61-4f44-bc18-eb8ed7ce5033
   response:
     body:
       string: ''
@@ -251,13 +251,13 @@ interactions:
       content-length:
       - '0'
       date:
-      - Thu, 11 Jan 2024 19:21:38 GMT
+      - Fri, 18 Apr 2025 15:35:32 GMT
       request-id:
-      - a1f77da6-30ea-47fd-9811-845c17bcd8c6
+      - 90710c4c-f6e3-443d-97ff-45ee3af96b9a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       x-azure-ref:
-      - 0wD+gZQAAAAACkJcjPSCqS7ZCIInS8m+tTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153532Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000yg9g
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -271,25 +271,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"22931ab4-7564-429d-994a-5f644173f86a"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"6bb30a9e-e37e-444c-96b8-57242cb0c85f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:41 GMT
+      - Fri, 18 Apr 2025 15:35:37 GMT
       request-id:
-      - 44efe420-b730-4baa-8292-8c165d86cf19
+      - 645ca964-2e29-4623-94d0-2e7a9e914486
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0xT+gZQAAAADVYMOW64ghRbPnlpx2wwrWTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153537Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fr74
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -303,9 +303,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/22931ab4-7564-429d-994a-5f644173f86a/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/6bb30a9e-e37e-444c-96b8-57242cb0c85f/variants
   response:
     body:
       string: '{"value":[]}'
@@ -313,15 +313,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:42 GMT
+      - Fri, 18 Apr 2025 15:35:37 GMT
       request-id:
-      - f8325d4f-9956-4123-8ab3-664236cc8e18
+      - 204bcbfc-c8e7-4299-923f-1ca4576389e6
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0xj+gZQAAAABW+Ba06dU+QKK60aoT8xl2TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153538Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007kyp
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan_listing.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan_listing.yaml
index 56031e7b..f866efb7 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan_listing.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_plan_listing.yaml
@@ -7,25 +7,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a9c4a38f-96b1-4a98-894a-b669a51ad961"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"1afb0b30-9471-40f1-b113-0058cd6510a5"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:35:17 GMT
       request-id:
-      - 2c41944c-32dc-489f-8e3f-5b5f2a76c491
+      - 5e0f9d81-52ee-41c5-a5e3-5c7a5f31effb
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAABP0b1sVr43Sbsb/YVAScBkTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153518Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007d92
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -39,25 +39,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"32100970-8385-cf43-1747-44c60d738df1"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"2fc3521a-b61c-3aef-57f5-1a63ad39dcc6"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:35:19 GMT
       request-id:
-      - d52e4c49-5ae4-4300-9861-b921e9f17b5b
+      - 782d39ea-84ed-4743-8a7b-45982492e9e1
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jj+gZQAAAACyHJe6EZEVQYuRzZX3TxQfTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153518Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007dbk
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -71,25 +71,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a9c4a38f-96b1-4a98-894a-b669a51ad961"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"1afb0b30-9471-40f1-b113-0058cd6510a5"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
+      - Fri, 18 Apr 2025 15:35:19 GMT
       request-id:
-      - e2117504-a4d2-4ccf-a9b0-31376ed1d726
+      - acaefd78-272b-4064-8a57-c9b1373e3c05
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jz+gZQAAAABcx697TYsfR7azDJPIQDIgTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153519Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007df7
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -103,9 +103,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/variants
   response:
     body:
       string: '{"value":[]}'
@@ -113,15 +113,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
+      - Fri, 18 Apr 2025 15:35:20 GMT
       request-id:
-      - 5bfbdddd-a8e1-42ed-bc60-5ed2c980507b
+      - 83cb10bf-52d3-4c2a-9661-cf971b9f0150
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jz+gZQAAAAD2/i9319iMQLCARZQh61IKTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153519Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fm0q
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -135,25 +135,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a9c4a38f-96b1-4a98-894a-b669a51ad961"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"1afb0b30-9471-40f1-b113-0058cd6510a5"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:53 GMT
+      - Fri, 18 Apr 2025 15:35:25 GMT
       request-id:
-      - d228ebdc-878b-4c97-af64-4f91d011c3b8
+      - 46eaedfb-e0d7-4933-9f6d-68e3c41e988a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0lD+gZQAAAAAhMGNfKP8LS4QTBZnZwj0eTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153525Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007f7n
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -170,30 +170,30 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/variants
   response:
     body:
       string: '{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001
-        name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"760117df-0000-0800-0000-65a03f960000\"","id":"dad3c0f2-ce3b-40e8-8ec1-5c8ba6e989e5"}'
+        name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"530057fd-0000-0800-0000-6802713e0000\"","id":"e434df35-0bdd-4023-b4e9-84ba80b0d246"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:54 GMT
+      - Fri, 18 Apr 2025 15:35:26 GMT
       etag:
-      - '"760117df-0000-0800-0000-65a03f960000"'
+      - '"530057fd-0000-0800-0000-6802713e0000"'
       location:
-      - https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/variants/dad3c0f2-ce3b-40e8-8ec1-5c8ba6e989e5
+      - https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/variants/e434df35-0bdd-4023-b4e9-84ba80b0d246
       request-id:
-      - cf7d9451-2e0f-4379-b5ee-2181d73db1aa
+      - e4fc7b49-accd-4cb0-98fc-ccd20197555a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0lT+gZQAAAACurL/BvzEzRIBH/KhVoJsSTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153525Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007fa7
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -207,25 +207,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a9c4a38f-96b1-4a98-894a-b669a51ad961"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"1afb0b30-9471-40f1-b113-0058cd6510a5"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:59 GMT
+      - Fri, 18 Apr 2025 15:35:32 GMT
       request-id:
-      - a92c207f-bcee-4d64-9e07-5aa933fcbd47
+      - 10672f70-ce4b-413e-ac99-b58364779d9d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0mz+gZQAAAADwb1A13u3ZS7y/fOwrDxpaTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153531Z-16b6fd4df76g488nhC1BL1pewn00000009hg0000000157yd
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -239,25 +239,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"32100970-8385-cf43-1747-44c60d738df1"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7254b2ba-df2d-070e-5cb4-280e8de40048","variantID":"dad3c0f2-ce3b-40e8-8ec1-5c8ba6e989e5"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"2fc3521a-b61c-3aef-57f5-1a63ad39dcc6"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"ec25c822-d3ce-8dc9-493b-96093d2b9035","variantID":"e434df35-0bdd-4023-b4e9-84ba80b0d246"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:00 GMT
+      - Fri, 18 Apr 2025 15:35:32 GMT
       request-id:
-      - 692ff5e6-9194-4c08-b5d1-2419ef5c0aeb
+      - 4b4c8abd-d626-4ff9-805a-8d2ceeeced1d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nD+gZQAAAACtOAa3jvYBT4pzUTyl5hQfTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153532Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007h99
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -271,25 +271,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a9c4a38f-96b1-4a98-894a-b669a51ad961"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"1afb0b30-9471-40f1-b113-0058cd6510a5"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:59 GMT
+      - Fri, 18 Apr 2025 15:35:33 GMT
       request-id:
-      - b4d5069e-cb12-4eba-b141-ba4d99a110b6
+      - 7435b00a-79e0-4cd8-9ff1-ab01dba0f387
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nD+gZQAAAACLHZWQ9tKgQ6U96zQakhujTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153532Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007hdy
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -303,26 +303,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/variants
   response:
     body:
       string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001
-        name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"760117df-0000-0800-0000-65a03f960000\"","id":"dad3c0f2-ce3b-40e8-8ec1-5c8ba6e989e5"}]}'
+        name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"530057fd-0000-0800-0000-6802713e0000\"","id":"e434df35-0bdd-4023-b4e9-84ba80b0d246"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:01 GMT
+      - Fri, 18 Apr 2025 15:35:32 GMT
       request-id:
-      - 66b1f3cc-4d1c-47ce-8cb8-04d892748b0f
+      - fe9901af-7bb7-40c2-b484-5da347d9186c
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nT+gZQAAAACoAaZxXh1dTI//+hfeXwzzTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153533Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fq3y
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -336,26 +336,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/listings/getByInstanceID(instanceID=7254b2ba-df2d-070e-5cb4-280e8de40048)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/listings/getByInstanceID(instanceID=ec25c822-d3ce-8dc9-493b-96093d2b9035)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000001
-        name","keywords":[],"@odata.etag":"\"3c00a3b5-0000-0800-0000-65a03f980000\"","id":"a0ba49d7-4a7e-412e-6df4-8187bc2d180f"}]}'
+        name","keywords":[],"@odata.etag":"\"6a02e9c9-0000-0800-0000-680271400000\"","id":"158ac3d3-ba1d-f4e7-74f2-eaeba259e85f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:01 GMT
+      - Fri, 18 Apr 2025 15:35:33 GMT
       request-id:
-      - 55d65522-3d15-43f4-93ad-94bb35d01c4f
+      - 2a24015b-c300-44de-afa0-0f2d956f1786
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nT+gZQAAAAC+n6u1VFqvR6rxlEa+KS8ETU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153533Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007hmx
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -369,25 +369,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a9c4a38f-96b1-4a98-894a-b669a51ad961"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"1afb0b30-9471-40f1-b113-0058cd6510a5"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:01 GMT
+      - Fri, 18 Apr 2025 15:35:33 GMT
       request-id:
-      - 7147ac54-1318-4e1f-b4e7-17fb39bb13a1
+      - 2a824202-6a32-4e1d-8775-96ca0bdf9021
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nj+gZQAAAADrb0hSbDl/R66Q5jIMlPhlTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153533Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000ygqc
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -401,25 +401,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"32100970-8385-cf43-1747-44c60d738df1"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"7254b2ba-df2d-070e-5cb4-280e8de40048","variantID":"dad3c0f2-ce3b-40e8-8ec1-5c8ba6e989e5"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"2fc3521a-b61c-3aef-57f5-1a63ad39dcc6"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"ec25c822-d3ce-8dc9-493b-96093d2b9035","variantID":"e434df35-0bdd-4023-b4e9-84ba80b0d246"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:35:33 GMT
       request-id:
-      - fd90856b-05c3-4bc0-ad7e-79d4d86993ff
+      - c2a294ab-0111-4b9f-a120-3c6c38c93a57
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nj+gZQAAAABveW9Q2kfyTbSADqRhxroFTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153534Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000ygub
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -433,25 +433,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"a9c4a38f-96b1-4a98-894a-b669a51ad961"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000002 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"1afb0b30-9471-40f1-b113-0058cd6510a5"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:35:34 GMT
       request-id:
-      - 04f579f3-5b54-40f3-ba13-6513417146cc
+      - f1ab1f53-aa1e-4362-ad75-f33319b29bd0
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAAC3ScyBPGlPR7lEJ580ZcCcTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153534Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007hy0
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -465,26 +465,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/variants
   response:
     body:
       string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001
-        name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"760117df-0000-0800-0000-65a03f960000\"","id":"dad3c0f2-ce3b-40e8-8ec1-5c8ba6e989e5"}]}'
+        name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"extendedProperties":[],"@odata.etag":"\"530057fd-0000-0800-0000-6802713e0000\"","id":"e434df35-0bdd-4023-b4e9-84ba80b0d246"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:35:34 GMT
       request-id:
-      - 7e7a423d-6da1-499f-8c43-e0d3275b0fc0
+      - 8704b681-8706-4e9f-9186-c9cfc165d4b1
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAADDLeratmQXQqeTiEGIT2EoTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153535Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000yh2p
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -498,26 +498,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/listings/getByInstanceID(instanceID=7254b2ba-df2d-070e-5cb4-280e8de40048)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/listings/getByInstanceID(instanceID=ec25c822-d3ce-8dc9-493b-96093d2b9035)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000001
-        name","keywords":[],"@odata.etag":"\"3c00a3b5-0000-0800-0000-65a03f980000\"","id":"a0ba49d7-4a7e-412e-6df4-8187bc2d180f"}]}'
+        name","keywords":[],"@odata.etag":"\"6a02e9c9-0000-0800-0000-680271400000\"","id":"158ac3d3-ba1d-f4e7-74f2-eaeba259e85f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:35:34 GMT
       request-id:
-      - eb340f90-3360-41e4-b708-b84b69b277aa
+      - 0e4a868e-43a9-49b7-8eee-9e821500f047
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAACc6FPg7YufRKqoGuC/9itXTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153535Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000yh3z
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -526,8 +526,8 @@ interactions:
 - request:
     body: '{"resourceType": "AzureListing", "listingUris": [], "listingContacts":
       [], "gettingStartedInstructions": "", "languageCode": "en-us", "title": "updated
-      name", "keywords": [], "@odata.etag": "\"3c00a3b5-0000-0800-0000-65a03f980000\"",
-      "ID": "a0ba49d7-4a7e-412e-6df4-8187bc2d180f", "shortDescription": "updated summary",
+      name", "keywords": [], "@odata.etag": "\"6a02e9c9-0000-0800-0000-680271400000\"",
+      "ID": "158ac3d3-ba1d-f4e7-74f2-eaeba259e85f", "shortDescription": "updated summary",
       "description": "updated description"}'
     headers:
       Accept:
@@ -537,28 +537,28 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/a9c4a38f-96b1-4a98-894a-b669a51ad961/listings/a0ba49d7-4a7e-412e-6df4-8187bc2d180f
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/1afb0b30-9471-40f1-b113-0058cd6510a5/listings/158ac3d3-ba1d-f4e7-74f2-eaeba259e85f
   response:
     body:
       string: '{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"updated
-        name","description":"updated description","shortDescription":"updated summary","keywords":[],"@odata.etag":"\"3c00eab6-0000-0800-0000-65a03fa00000\"","id":"a0ba49d7-4a7e-412e-6df4-8187bc2d180f"}'
+        name","description":"updated description","shortDescription":"updated summary","keywords":[],"@odata.etag":"\"6a0283cb-0000-0800-0000-680271470000\"","id":"158ac3d3-ba1d-f4e7-74f2-eaeba259e85f"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:04 GMT
+      - Fri, 18 Apr 2025 15:35:36 GMT
       etag:
-      - '"3c00eab6-0000-0800-0000-65a03fa00000"'
+      - '"6a0283cb-0000-0800-0000-680271470000"'
       request-id:
-      - d3251441-1827-4a7f-8e5e-63975a743187
+      - b8968384-664b-4c86-bd48-2d4452e39fe1
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAACstxqrnD8IRby+6fgMbMVDTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153535Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000yh71
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup.yaml
index 45d2efc4..a8a6710f 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup.yaml
@@ -7,25 +7,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"07a5b568-808e-4a1d-a6c2-eb7ad727959f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:09 GMT
+      - Fri, 18 Apr 2025 13:24:06 GMT
       request-id:
-      - 4c5ed5a9-7d04-4470-8f96-120812e50afe
+      - 04bdc168-150e-4fe0-81f8-2f73362bc563
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0pD+gZQAAAADf1SmUDiSMTJl94ZhqrixeTU5aMjIxMDYwNjEzMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132406Z-16b6fd4df7628jlzhC1BL1p2qn0000000840000000010fgp
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -39,9 +39,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628/setup
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/07a5b568-808e-4a1d-a6c2-eb7ad727959f/setup
   response:
     body:
       string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Enabled"}]}'
@@ -49,15 +49,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:09 GMT
+      - Fri, 18 Apr 2025 13:24:06 GMT
       request-id:
-      - 9ebe1070-7780-4a6f-9d26-b1534b16903e
+      - 41c19550-3cdb-4fd5-ae08-9e09f8f9f322
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0pT+gZQAAAAAeFVowV6EVQqMVts8NXZqrTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132407Z-16b6fd4df7628jlzhC1BL1p2qn0000000840000000010fkd
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -71,25 +71,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"07a5b568-808e-4a1d-a6c2-eb7ad727959f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:14 GMT
+      - Fri, 18 Apr 2025 13:24:12 GMT
       request-id:
-      - 198df399-0e3f-4b45-9075-03bebb26ce67
+      - 4b770891-ab4e-48ff-a2ff-52e4d6d56372
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qj+gZQAAAAAUOsENO9/vSJHcd/yU+AuRTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132412Z-16b6fd4df76j9l2phC1BL1b85g0000000aeg00000000xzx2
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -103,25 +103,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"07a5b568-808e-4a1d-a6c2-eb7ad727959f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:15 GMT
+      - Fri, 18 Apr 2025 13:24:13 GMT
       request-id:
-      - 39deb155-b728-4cbd-aede-ead34aaa7de8
+      - 573d3037-6b8a-4c7a-9353-b41bbac086e9
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qz+gZQAAAABO5m8462hGTroYgQzYHdhqTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132412Z-16b6fd4df76g488nhC1BL1pewn000000099g00000000xx5x
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -135,9 +135,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628/setup
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/07a5b568-808e-4a1d-a6c2-eb7ad727959f/setup
   response:
     body:
       string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Enabled"}]}'
@@ -145,15 +145,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:15 GMT
+      - Fri, 18 Apr 2025 13:24:13 GMT
       request-id:
-      - 004fc09b-2258-4d8f-9b6b-0273a962e5a6
+      - 6de3115f-e77a-4efd-9e26-cb1efffd5f70
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0qz+gZQAAAAAktQAqwZeqT6KyezaCViWRTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132413Z-16b6fd4df76g488nhC1BL1pewn000000099g00000000xx8x
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -167,25 +167,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"07a5b568-808e-4a1d-a6c2-eb7ad727959f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:16 GMT
+      - Fri, 18 Apr 2025 13:24:13 GMT
       request-id:
-      - f6fcdc6c-2f99-4672-b8c3-131c1b8c19f5
+      - 02b9fd76-d8cb-4959-97ff-40e7896b49e8
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rD+gZQAAAAC/YM+yqpPDSoOxln0rc0gwTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132413Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk0000000005sff
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -203,9 +203,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628/setup
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/07a5b568-808e-4a1d-a6c2-eb7ad727959f/setup
   response:
     body:
       string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"https://updated.tria.uri/","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Enabled"}]}'
@@ -213,15 +213,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:17 GMT
+      - Fri, 18 Apr 2025 13:24:14 GMT
       request-id:
-      - 73b2b33a-46a8-4e80-a9e7-494bb23dedc4
+      - 6f046815-be2c-4a8c-85bc-5fcff99a5ff6
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rD+gZQAAAABePER1ohNKT58ZA+ghon8ATU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132413Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk0000000005sgw
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -235,25 +235,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"07a5b568-808e-4a1d-a6c2-eb7ad727959f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:17 GMT
+      - Fri, 18 Apr 2025 13:24:14 GMT
       request-id:
-      - 85bcaac3-1d21-4e14-b55a-7e670f8e7d0d
+      - 2274ee1f-08c7-448e-8974-e8760ccc9aef
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rT+gZQAAAACWk86v3fV9SZqUvSjnI7vqTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132415Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk0000000005sut
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -267,9 +267,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628/setup
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/07a5b568-808e-4a1d-a6c2-eb7ad727959f/setup
   response:
     body:
       string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"https://updated.tria.uri/","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Enabled"}]}'
@@ -277,15 +277,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:17 GMT
+      - Fri, 18 Apr 2025 13:24:14 GMT
       request-id:
-      - 21424af5-fa17-4ba3-8d9e-aaa82c71ce33
+      - 20b88017-395a-4b15-b6e0-382f525f1b1a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0rT+gZQAAAABDk1ruFIkJS7yS5FcNPcsFTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132415Z-16b6fd4df76qtdgbhC1BL1s0100000000be000000000s5n4
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -299,25 +299,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"07a5b568-808e-4a1d-a6c2-eb7ad727959f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:23 GMT
+      - Fri, 18 Apr 2025 13:24:20 GMT
       request-id:
-      - 42f27f44-f1d8-4dc8-ad97-bfe3dd6c3dff
+      - 3ed185a7-3c69-40ad-979c-7859eb50a85a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sz+gZQAAAABf/jsqxs6ASLLkf/0PW7BRTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132420Z-16b6fd4df76g488nhC1BL1pewn000000099g00000000xzmq
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -331,9 +331,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628/setup
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/07a5b568-808e-4a1d-a6c2-eb7ad727959f/setup
   response:
     body:
       string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"https://updated.tria.uri/","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Enabled"}]}'
@@ -341,15 +341,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:23 GMT
+      - Fri, 18 Apr 2025 13:24:20 GMT
       request-id:
-      - 20e6bdd3-c1b7-40fb-b34c-e6890b1721ac
+      - 1c05d199-da72-4c8d-b406-aab42722c441
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sz+gZQAAAAA2JheiJwVnQ5Sqqb5bvJsuTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132421Z-16b6fd4df7628jlzhC1BL1p2qn0000000840000000010kvr
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -363,25 +363,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"fd7f9ebe-f05b-4c81-9e10-6d8b61bf3628"}]}'
+      string: '{"value":[{"resourceType":"AzureContainer","name":"clitest000001 Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"07a5b568-808e-4a1d-a6c2-eb7ad727959f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:29 GMT
+      - Fri, 18 Apr 2025 13:24:26 GMT
       request-id:
-      - aef15e60-21fe-4cbc-83e1-0ef708c755ad
+      - f6667f1b-1531-493e-a92b-30229ac44242
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0uD+gZQAAAAAqMu4GrqPJRZBzkuV+ARKATU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132426Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk0000000005vm7
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup_test_drive_on_vm_type.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup_test_drive_on_vm_type.yaml
index 88c974d6..fd4f6e63 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup_test_drive_on_vm_type.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_marketplace_offer_setup_test_drive_on_vm_type.yaml
@@ -7,26 +7,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"clitest000001
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"3d153867-3c20-40b6-9ef2-0b3feac74a49"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"047b0828-b67d-4857-b46e-bff41a889f7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:21 GMT
+      - Fri, 18 Apr 2025 13:24:43 GMT
       request-id:
-      - 11d81a0e-d3c5-46d0-99fc-22d4a8a59312
+      - f7d2ad17-e51a-43f2-ad57-5f6d0a6d317e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sT+gZQAAAAA55zutNjQxQq8U+LMO5pTrTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132443Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk000000000602e
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -40,26 +40,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"clitest000001
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"3d153867-3c20-40b6-9ef2-0b3feac74a49"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"047b0828-b67d-4857-b46e-bff41a889f7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:21 GMT
+      - Fri, 18 Apr 2025 13:24:44 GMT
       request-id:
-      - 3eaf737b-8908-4f17-b441-c7ffdd8b506a
+      - 586b466a-d4ff-489d-a553-21f4f7d52d2e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sj+gZQAAAABq+JTETf6CT46qHMgWV4LlTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132444Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk000000000606k
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -73,9 +73,9 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/3d153867-3c20-40b6-9ef2-0b3feac74a49/setup
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/047b0828-b67d-4857-b46e-bff41a889f7f/setup
   response:
     body:
       string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
@@ -83,15 +83,15 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:22 GMT
+      - Fri, 18 Apr 2025 13:24:44 GMT
       request-id:
-      - aeefc106-d0fa-47a3-a70a-b2d86b214b08
+      - a9847151-3c79-45b0-8e72-94d3fe078273
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sj+gZQAAAACr21uqe5onSoEIQPyt78nJTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132444Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk000000000608y
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -105,26 +105,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"clitest000001
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"3d153867-3c20-40b6-9ef2-0b3feac74a49"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"047b0828-b67d-4857-b46e-bff41a889f7f"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:22 GMT
+      - Fri, 18 Apr 2025 13:24:44 GMT
       request-id:
-      - 11ab3fb3-64c5-4892-9f72-dac78c4ed840
+      - b0555e45-a8a6-43b1-9198-38584adb07dc
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sz+gZQAAAADQmRuz87T7Q5xQ03uHPmmKTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132445Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk00000000060b2
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -142,93 +142,30 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/3d153867-3c20-40b6-9ef2-0b3feac74a49/setup
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/047b0828-b67d-4857-b46e-bff41a889f7f/setup
   response:
     body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":true,"testDriveType":"AzureResourceManager","channelStates":[{"type":"Reseller","value":"Disabled"}]}'
+      string: '"ICH50400 - Unable to complete request. {\"faultCode\":50400,\"reasonPhrase\":\"Request
+        validation failed.\",\"correlationId\":\"808f5191-e926-4ba0-b167-d1c0f04ebca8\",\"operationId\":\"1cdfd6fbf1a6b992666e80aa9e781e13\",\"data\":{\"FeatureName\":[\"The
+        field FeatureName is invalid.\"]}}"'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:25 GMT
+      - Fri, 18 Apr 2025 13:24:46 GMT
       request-id:
-      - de8288c9-fe52-4a8b-b5bc-7a0a4e49621c
+      - 97001d23-41c5-4019-9ac7-50d3a79a3e11
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0sz+gZQAAAABr1g1cpH4dRbGpMmloipzLTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T132445Z-15bd8fcd597khbdlhC1BL1cm6s0000000bk00000000060fc
       x-cache:
       - CONFIG_NOCACHE
     status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000001%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureThirdPartyVirtualMachine","name":"clitest000001
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000001"}],"isModularPublishing":true,"id":"3d153867-3c20-40b6-9ef2-0b3feac74a49"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:21:25 GMT
-      request-id:
-      - 8e70e677-40dd-4c71-adb0-c06c1d6d3dd7
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0tT+gZQAAAACJNN+g1/GNQo5iWpjJftLyTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/3d153867-3c20-40b6-9ef2-0b3feac74a49/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":true,"testDriveType":"AzureResourceManager","channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:21:25 GMT
-      request-id:
-      - ca6ca94e-a667-4846-8dfc-31527def6de6
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0tj+gZQAAAABBujz2MXxwQom9oStQbdk0TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
+      code: 400
+      message: Bad Request
 version: 1
diff --git a/partnercenter/azext_partnercenter/tests/latest/recordings/test_solution_template_creation.yaml b/partnercenter/azext_partnercenter/tests/latest/recordings/test_solution_template_creation.yaml
index c1bc4460..53d872ba 100644
--- a/partnercenter/azext_partnercenter/tests/latest/recordings/test_solution_template_creation.yaml
+++ b/partnercenter/azext_partnercenter/tests/latest/recordings/test_solution_template_creation.yaml
@@ -7,26 +7,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - d958f9c9-8185-48c3-9929-85420ce77699
+      - 055d0ac8-7dea-47ce-b437-fd53397ad9a4
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iT+gZQAAAADIaf3hZtVOSp7a3vVXNwDSTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153441Z-16b6fd4df76g488nhC1BL1pewn00000009hg000000014wfh
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -40,25 +40,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"154d1824-4343-63cb-9434-c1f08b6aca99"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"171df728-a999-f5bf-3403-ab62298b8f3c","variantID":"testdrive"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e145aeee-0ce5-8729-b67b-f0da5804b828"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:41 GMT
       request-id:
-      - 35140adb-6ffe-4970-a2f3-67886ce89e82
+      - 087e860c-3727-4690-92ab-77f0adf0a52a
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iT+gZQAAAABOhCCZAVEeQYq834weVAW+TU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000741x
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -72,26 +72,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/listings/getByInstanceID(instanceID=154d1824-4343-63cb-9434-c1f08b6aca99)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/listings/getByInstanceID(instanceID=e145aeee-0ce5-8729-b67b-f0da5804b828)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"7100d75c-0000-0800-0000-65a03f860000\"","id":"c1a0f296-8d5a-ff83-1d14-17cdff8028f5"}]}'
+        Alias","keywords":[],"@odata.etag":"\"ad00c8c3-0000-0800-0000-6802710e0000\"","id":"805cfd41-c33c-e36d-55d3-83aa2f1395dc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 3b59f963-7890-44a1-9c65-fde225027461
+      - c63a4b69-2c73-490b-bca5-c688323c1fe9
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iT+gZQAAAABwNNlqtK9bRK5fNJ+wGjmcTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000743k
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -105,26 +105,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:41 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - c18016a8-f411-4ff9-aa37-9fe0789f5f59
+      - ac3d235b-dac1-48d2-81cc-04dc574454f5
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAACTMbYP/7ldTrNJPp90XLFnTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153442Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000747a
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -138,25 +138,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"154d1824-4343-63cb-9434-c1f08b6aca99"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"171df728-a999-f5bf-3403-ab62298b8f3c","variantID":"testdrive"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e145aeee-0ce5-8729-b67b-f0da5804b828"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 944dc635-88b2-423f-abce-0d6d42978d48
+      - 8ed22df7-cc70-40d3-bb0e-85c1fc4b95a3
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAACtKqXyrodeQLS47CtQgmZJTU5aMjIxMDYwNjEzMDE5ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153443Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074an
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -170,26 +170,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/listings/getByInstanceID(instanceID=154d1824-4343-63cb-9434-c1f08b6aca99)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/listings/getByInstanceID(instanceID=e145aeee-0ce5-8729-b67b-f0da5804b828)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"7100d75c-0000-0800-0000-65a03f860000\"","id":"c1a0f296-8d5a-ff83-1d14-17cdff8028f5"}]}'
+        Alias","keywords":[],"@odata.etag":"\"ad00c8c3-0000-0800-0000-6802710e0000\"","id":"805cfd41-c33c-e36d-55d3-83aa2f1395dc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:42 GMT
       request-id:
-      - 14310c88-da14-4c3b-a5f3-c6df7d47f79a
+      - 51cfa91a-2030-4f75-ac8a-dcacd686cc94
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0ij+gZQAAAAAS4eU4JtCdQbB08mPLvAAETU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153443Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074cd
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -203,26 +203,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:42 GMT
+      - Fri, 18 Apr 2025 15:34:43 GMT
       request-id:
-      - b299d37d-1936-4f24-9c25-8751e3eda48b
+      - 8bbaeea8-b041-4b3d-adf0-e3906be66c83
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iz+gZQAAAADiZFDOhruqSZMf6c43ctNpTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153443Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074ff
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -236,26 +236,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:43 GMT
       request-id:
-      - bc32a5e0-f54a-481c-9adf-e5a0dd4f1ad1
+      - a5ede4a7-04e0-41c7-887b-d87ba4665b6d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0iz+gZQAAAAAk+CcQQLBoQL9cY0Gtt6EqTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153444Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074nu
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -269,25 +269,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"154d1824-4343-63cb-9434-c1f08b6aca99"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"171df728-a999-f5bf-3403-ab62298b8f3c","variantID":"testdrive"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e145aeee-0ce5-8729-b67b-f0da5804b828"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:43 GMT
       request-id:
-      - 9be29168-da4b-4e36-80f8-4ad1e0ebba7a
+      - 7a2f6eec-a8ee-47a1-ba05-06637d50bd97
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAABFgZj4M+tZT7l6rxZB0bibTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153444Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074qu
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -301,26 +301,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/listings/getByInstanceID(instanceID=154d1824-4343-63cb-9434-c1f08b6aca99)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/listings/getByInstanceID(instanceID=e145aeee-0ce5-8729-b67b-f0da5804b828)
   response:
     body:
       string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"clitest000002
-        Alias","keywords":[],"@odata.etag":"\"7100d75c-0000-0800-0000-65a03f860000\"","id":"c1a0f296-8d5a-ff83-1d14-17cdff8028f5"}]}'
+        Alias","keywords":[],"@odata.etag":"\"ad00c8c3-0000-0800-0000-6802710e0000\"","id":"805cfd41-c33c-e36d-55d3-83aa2f1395dc"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:43 GMT
+      - Fri, 18 Apr 2025 15:34:43 GMT
       request-id:
-      - 05d51551-802e-4ee7-a336-a3c57236d271
+      - 4eba197b-3fcc-4acd-932e-7f2a3a8434ff
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAAC57JLjD3AZS708lfJPCq7CTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153444Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000074sn
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -330,7 +330,7 @@ interactions:
     body: '{"resourceType": "AzureListing", "description": "Unreal Cloud DDC for Unreal
       Engine game development.", "title": "clitest000002 Alias", "summary": "A storage
       offer for Unreal Engine Game Developers", "shortDescription": "Unreal Cloud
-      DDC for Unreal Engine game development.", "@odata.etag": "\"7100d75c-0000-0800-0000-65a03f860000\"",
+      DDC for Unreal Engine game development.", "@odata.etag": "\"ad00c8c3-0000-0800-0000-6802710e0000\"",
       "listingUris": [], "listingContacts": []}'
     headers:
       Accept:
@@ -340,30 +340,30 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/listings/c1a0f296-8d5a-ff83-1d14-17cdff8028f5
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/listings/805cfd41-c33c-e36d-55d3-83aa2f1395dc
   response:
     body:
       string: '{"resourceType":"AzureListing","summary":"A storage offer for Unreal
         Engine Game Developers","listingUris":[],"listingContacts":[],"languageCode":"en-us","title":"clitest000002
         Alias","description":"Unreal Cloud DDC for Unreal Engine game development.","shortDescription":"Unreal
-        Cloud DDC for Unreal Engine game development.","@odata.etag":"\"7100265d-0000-0800-0000-65a03f8d0000\"","id":"c1a0f296-8d5a-ff83-1d14-17cdff8028f5"}'
+        Cloud DDC for Unreal Engine game development.","@odata.etag":"\"ad004cc4-0000-0800-0000-680271150000\"","id":"805cfd41-c33c-e36d-55d3-83aa2f1395dc"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:44 GMT
+      - Fri, 18 Apr 2025 15:34:44 GMT
       etag:
-      - '"7100265d-0000-0800-0000-65a03f8d0000"'
+      - '"ad004cc4-0000-0800-0000-680271150000"'
       request-id:
-      - 006b3f01-4ac2-4954-b86a-85a757664019
+      - 8272db97-770e-4862-b083-b515b7959538
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jD+gZQAAAADkVjaNn9yDRYqrfpO7PZa6TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153444Z-16b6fd4df76j9l2phC1BL1b85g0000000aqg00000001734f
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -377,323 +377,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
+      - Fri, 18 Apr 2025 15:34:45 GMT
       request-id:
-      - d4044522-09a1-45c2-9d09-1f09b62e206f
+      - 30c86bb8-e67d-4b5c-889f-18619643b37e
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0jT+gZQAAAACSz4N6HZWoSIWREWIYMHEtTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
-      request-id:
-      - 39db40d7-b4ba-4d95-b169-9b696f21e90b
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jj+gZQAAAABo4Bqg38FiTZ9Hx43yLkxZTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:46 GMT
-      request-id:
-      - 05653b01-0521-413a-bc13-163df23f4531
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jj+gZQAAAACTseYgv6VcSJt15O5kP9epTU5aMjIxMDYwNjEzMDE5ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
-      request-id:
-      - 5639806c-30d9-42cf-9772-6419c16d3465
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jz+gZQAAAABs9jvQIRXCSKti/qUk0izyTU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
-      request-id:
-      - 0be052df-127d-4603-9385-3ab9906403f7
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jz+gZQAAAAC4EV9cVSYETIx3KgJPMNxtTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:47 GMT
-      request-id:
-      - 63bd4b59-cc3d-435b-885d-29e2e30c5041
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0jz+gZQAAAABu7VEImwClQqgAD0wLWwg1TU5aMjIxMDYwNjExMDIzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: '{"resourceType": "AzureProductSetup", "enableTestDrive": false, "sellingOption":
-      "ListAndSell", "trialUri": "", "channelStates": [{"type": "Reseller", "value":
-      "Disabled"}]}'
-    headers:
-      Accept:
-      - application/json
-      Content-Type:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
-      request-id:
-      - 0c24ebd1-41df-496c-a3f3-9aafab8ade3b
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kD+gZQAAAACJ+xt1Ju4kTK0k692PjG6rTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:48 GMT
-      request-id:
-      - 14d479d2-0119-4a0f-affa-693faec6127a
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kT+gZQAAAABT718EL53uTo/OjaTnNouHTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/setup
-  response:
-    body:
-      string: '{"resourceType":"AzureProductSetup","sellingOption":"ListAndSell","trialUri":"","enableTestDrive":false,"channelStates":[{"type":"Reseller","value":"Disabled"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
-      request-id:
-      - adedc63b-cbed-4039-88da-b8cfeffbbdca
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kT+gZQAAAABcRBtzJ7nbRpEpqeiwJKGWTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
-      x-cache:
-      - CONFIG_NOCACHE
-    status:
-      code: 200
-      message: OK
-- request:
-    body: null
-    headers:
-      Accept:
-      - application/json
-      If-Match:
-      - '*'
-      User-Agent:
-      - OpenAPI-Generator/v1/python
-    method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
-  response:
-    body:
-      string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
-    headers:
-      content-type:
-      - application/json; charset=utf-8
-      date:
-      - Thu, 11 Jan 2024 19:20:49 GMT
-      request-id:
-      - a3b49c4f-b4d2-4991-a9db-1769393fa52e
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains
-      transfer-encoding:
-      - chunked
-      x-azure-ref:
-      - 0kj+gZQAAAAAlFElGXs80SJpYyNsAbuKyTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153445Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug000000007537
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -710,29 +413,29 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: POST
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/variants
   response:
     body:
-      string: '{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"solution-template","extendedProperties":[],"@odata.etag":"\"760164dd-0000-0800-0000-65a03f930000\"","id":"7d4e9ff7-aabc-451a-9c2a-2b568a59261b"}'
+      string: '{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"solution-template","extendedProperties":[],"@odata.etag":"\"530057fc-0000-0800-0000-680271160000\"","id":"32808650-c7b6-42f4-b0cc-1a60dfd5eb9a"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:20:51 GMT
+      - Fri, 18 Apr 2025 15:34:46 GMT
       etag:
-      - '"760164dd-0000-0800-0000-65a03f930000"'
+      - '"530057fc-0000-0800-0000-680271160000"'
       location:
-      - https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/variants/7d4e9ff7-aabc-451a-9c2a-2b568a59261b
+      - https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/variants/32808650-c7b6-42f4-b0cc-1a60dfd5eb9a
       request-id:
-      - 8a8d20a3-3f60-4aeb-ac16-cc0ccb7ec886
+      - cb1bdd3d-1810-413c-8450-e655ca06f245
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0kj+gZQAAAACyuQDkJvu7QI/edgyRj44YTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153446Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000756g
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -746,26 +449,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:34:57 GMT
       request-id:
-      - d0438baf-ebb9-400f-a158-ebb4680c6602
+      - 9476d81e-8fd9-484d-870b-d9dccd30c1d8
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nT+gZQAAAADKHVpwWhHgSpZyLT6NSglvTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153457Z-16b6fd4df76g488nhC1BL1pewn00000009hg0000000150f0
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -779,25 +482,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"154d1824-4343-63cb-9434-c1f08b6aca99"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"171df728-a999-f5bf-3403-ab62298b8f3c","variantID":"testdrive"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e29350e7-2c92-86d4-a4b2-f0a4214dcc91","variantID":"7d4e9ff7-aabc-451a-9c2a-2b568a59261b"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e145aeee-0ce5-8729-b67b-f0da5804b828"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"2ba4098a-8bc2-18e2-a21e-285a652f7b56","variantID":"32808650-c7b6-42f4-b0cc-1a60dfd5eb9a"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:34:58 GMT
       request-id:
-      - 90223325-c1a0-4218-80a7-54abe6c8af38
+      - 18ed0238-d8ec-4f1c-9bf4-c7f6f54a34fd
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nj+gZQAAAABkw9Xyj3oZQqabpk/LUnfETU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153457Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y513
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -811,26 +514,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:02 GMT
+      - Fri, 18 Apr 2025 15:34:58 GMT
       request-id:
-      - b6425c23-7455-44f6-bd5e-f05664dd9449
+      - 0b03536a-3d64-45af-949d-53bc266e6ede
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nj+gZQAAAABujl8ON3tnR5ytBx5hARKiTU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153458Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y56k
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -844,25 +547,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/variants
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureTestDriveVariant","state":"Inactive","@odata.etag":"\"7601dad5-0000-0800-0000-65a03f860000\"","id":"testdrive"},{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"solution-template","extendedProperties":[],"@odata.etag":"\"760164dd-0000-0800-0000-65a03f930000\"","id":"7d4e9ff7-aabc-451a-9c2a-2b568a59261b"}]}'
+      string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"solution-template","extendedProperties":[],"@odata.etag":"\"530057fc-0000-0800-0000-680271160000\"","id":"32808650-c7b6-42f4-b0cc-1a60dfd5eb9a"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:34:58 GMT
       request-id:
-      - af3d0142-f169-41c1-ba43-2e99d978d89a
+      - 3100bdfb-760c-4709-8312-cfe57a9def85
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAACDRHWVkaUlQJqTBo/XeNOfTU5aMjIxMDYwNjEyMDM1ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153458Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fddw
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -876,25 +579,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/listings/getByInstanceID(instanceID=e29350e7-2c92-86d4-a4b2-f0a4214dcc91)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/listings/getByInstanceID(instanceID=2ba4098a-8bc2-18e2-a21e-285a652f7b56)
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000001name","keywords":[],"@odata.etag":"\"7100975d-0000-0800-0000-65a03f950000\"","id":"77472f9e-b1f3-3d2a-cf8b-301c509c1c73"}]}'
+      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000001name","keywords":[],"@odata.etag":"\"ad0094c4-0000-0800-0000-680271190000\"","id":"454a95ec-c1f8-f6ac-ce9c-c3ff1d28af59"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:34:59 GMT
       request-id:
-      - 1b4c9a74-ce4b-4e98-b1c8-8c2d6bf82537
+      - 821dd106-db27-461a-b248-e2f9b3250684
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0nz+gZQAAAAAePHBUqdbQS5gve/178pvJTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153459Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y5dd
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -908,26 +611,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:34:59 GMT
       request-id:
-      - cd5e89f6-0d8b-4764-8119-1ad4ecf6b01a
+      - c3852108-8fe1-4a80-b063-9a2cb943df0d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAACPxfYspfM2SY1y3WMhB055TU5aMjIxMDYwNjEzMDQ3ADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153459Z-16b6fd4df76g488nhC1BL1pewn00000009hg0000000150xk
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -941,25 +644,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/branches/getByModule(module=Listing)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/branches/getByModule(module=Listing)
   response:
     body:
-      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"154d1824-4343-63cb-9434-c1f08b6aca99"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"171df728-a999-f5bf-3403-ab62298b8f3c","variantID":"testdrive"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e29350e7-2c92-86d4-a4b2-f0a4214dcc91","variantID":"7d4e9ff7-aabc-451a-9c2a-2b568a59261b"}]}'
+      string: '{"value":[{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"e145aeee-0ce5-8729-b67b-f0da5804b828"},{"resourceType":"Branch","friendlyName":"Main","type":"Main","module":"Listing","currentDraftInstanceID":"2ba4098a-8bc2-18e2-a21e-285a652f7b56","variantID":"32808650-c7b6-42f4-b0cc-1a60dfd5eb9a"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:03 GMT
+      - Fri, 18 Apr 2025 15:34:59 GMT
       request-id:
-      - 98d0332d-754b-46e9-b733-8e779fd08ba6
+      - 99505dfd-4108-45ed-85f7-bf7df9ed467d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAABgv78ZSOeaS6W6R7HQZ8b8TU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153459Z-16b6fd4df76g488nhC1BL1pewn00000009hg00000001510c
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -973,26 +676,26 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
     uri: https://api.partner.microsoft.com/v1.0/ingestion/products?%24filter=externalIDs%2FAny%28i%3Ai%2Ftype+eq+%27AzureOfferId%27+and+i%2Fvalue+eq+%27clitest000002%27%29
   response:
     body:
       string: '{"value":[{"resourceType":"AzureApplication","name":"clitest000002
-        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"905ad71f-732d-4e6e-baa1-61f0521f04dd"}]}'
+        Alias","externalIDs":[{"type":"AzureOfferId","value":"clitest000002"}],"isModularPublishing":true,"id":"0cdd1eea-1ac5-42cb-84f8-62d5dca1717b"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:05 GMT
+      - Fri, 18 Apr 2025 15:35:00 GMT
       request-id:
-      - 7671efc1-cbc4-4485-9120-48c624a72445
+      - d2b6901e-48c3-4ff2-9766-383b05bd93fc
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oD+gZQAAAACXBj/NFuibSL+0K3Af79ZmTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153500Z-16b6fd4df76qtdgbhC1BL1s0100000000bq000000000y5tp
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -1006,25 +709,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/variants
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/variants
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureTestDriveVariant","state":"Inactive","@odata.etag":"\"7601dad5-0000-0800-0000-65a03f860000\"","id":"testdrive"},{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"solution-template","extendedProperties":[],"@odata.etag":"\"760164dd-0000-0800-0000-65a03f930000\"","id":"7d4e9ff7-aabc-451a-9c2a-2b568a59261b"}]}'
+      string: '{"value":[{"resourceType":"AzureSkuVariant","state":"Active","friendlyName":"plantest-000001name","conversionPaths":"*","externalID":"plantest-000001","certificationsAzureGovernment":[],"cloudAvailabilities":["public-azure"],"subType":"solution-template","extendedProperties":[],"@odata.etag":"\"530057fc-0000-0800-0000-680271160000\"","id":"32808650-c7b6-42f4-b0cc-1a60dfd5eb9a"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:05 GMT
+      - Fri, 18 Apr 2025 15:35:00 GMT
       request-id:
-      - 8a70148c-e413-48b0-acef-d91ef30f12c0
+      - 32588e78-48cf-4874-b6f3-dede17a00a9c
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oT+gZQAAAACJqAuqufx6SLjDEMLp8K8bTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153500Z-15bd8fcd597pksjthC1BL1d4740000000btg00000000fduz
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -1038,25 +741,25 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: GET
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/listings/getByInstanceID(instanceID=e29350e7-2c92-86d4-a4b2-f0a4214dcc91)
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/listings/getByInstanceID(instanceID=2ba4098a-8bc2-18e2-a21e-285a652f7b56)
   response:
     body:
-      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000001name","keywords":[],"@odata.etag":"\"7100975d-0000-0800-0000-65a03f950000\"","id":"77472f9e-b1f3-3d2a-cf8b-301c509c1c73"}]}'
+      string: '{"value":[{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000001name","keywords":[],"@odata.etag":"\"ad0094c4-0000-0800-0000-680271190000\"","id":"454a95ec-c1f8-f6ac-ce9c-c3ff1d28af59"}]}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:05 GMT
+      - Fri, 18 Apr 2025 15:35:00 GMT
       request-id:
-      - 8e55a1cd-8059-4f1f-889b-3e45613fa04e
+      - 1100ae18-4422-4316-bc85-df2df6ca61b5
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oT+gZQAAAACzCIVeVwiqRpC8ge+u8cllTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153500Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug0000000078yn
       x-cache:
       - CONFIG_NOCACHE
     status:
@@ -1065,8 +768,8 @@ interactions:
 - request:
     body: '{"resourceType": "AzureListing", "listingUris": [], "listingContacts":
       [], "gettingStartedInstructions": "", "languageCode": "en-us", "title": "plantest-000001name",
-      "keywords": [], "@odata.etag": "\"7100975d-0000-0800-0000-65a03f950000\"", "ID":
-      "77472f9e-b1f3-3d2a-cf8b-301c509c1c73", "shortDescription": "Unreal Cloud DDC
+      "keywords": [], "@odata.etag": "\"ad0094c4-0000-0800-0000-680271190000\"", "ID":
+      "454a95ec-c1f8-f6ac-ce9c-c3ff1d28af59", "shortDescription": "Unreal Cloud DDC
       for Unreal Engine game development.", "description": "Unreal Cloud DDC for Unreal
       Engine game development."}'
     headers:
@@ -1077,29 +780,29 @@ interactions:
       If-Match:
       - '*'
       User-Agent:
-      - OpenAPI-Generator/v1/python
+      - AzureCLI-PCExt/0.2.6
     method: PUT
-    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/905ad71f-732d-4e6e-baa1-61f0521f04dd/listings/77472f9e-b1f3-3d2a-cf8b-301c509c1c73
+    uri: https://api.partner.microsoft.com/v1.0/ingestion/products/0cdd1eea-1ac5-42cb-84f8-62d5dca1717b/listings/454a95ec-c1f8-f6ac-ce9c-c3ff1d28af59
   response:
     body:
       string: '{"resourceType":"AzureListing","listingUris":[],"listingContacts":[],"gettingStartedInstructions":"","languageCode":"en-us","title":"plantest-000001name","description":"Unreal
         Cloud DDC for Unreal Engine game development.","shortDescription":"Unreal
-        Cloud DDC for Unreal Engine game development.","keywords":[],"@odata.etag":"\"7100c360-0000-0800-0000-65a03fa20000\"","id":"77472f9e-b1f3-3d2a-cf8b-301c509c1c73"}'
+        Cloud DDC for Unreal Engine game development.","keywords":[],"@odata.etag":"\"ad0044c5-0000-0800-0000-680271250000\"","id":"454a95ec-c1f8-f6ac-ce9c-c3ff1d28af59"}'
     headers:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 11 Jan 2024 19:21:06 GMT
+      - Fri, 18 Apr 2025 15:35:00 GMT
       etag:
-      - '"7100c360-0000-0800-0000-65a03fa20000"'
+      - '"ad0044c5-0000-0800-0000-680271250000"'
       request-id:
-      - 5aac6178-f8c3-4791-a86c-8b370a9c982a
+      - 21670fc5-af3a-4c05-9fd4-e68449dcf39d
       strict-transport-security:
       - max-age=31536000; includeSubDomains
       transfer-encoding:
       - chunked
       x-azure-ref:
-      - 0oj+gZQAAAAAm42pT2uSySYH1Wvtz1mnHTU5aMjIxMDYwNjE0MDMzADIyMTBkMjhhLTUzYmItNDExNi1hOGM1LWU4ZjhiNDUxYmM4Yw==
+      - 20250418T153501Z-15bd8fcd597khbdlhC1BL1cm6s0000000bug00000000790r
       x-cache:
       - CONFIG_NOCACHE
     status:
diff --git a/partnercenter/azext_partnercenter/tests/latest/test_marketplace_application.py b/partnercenter/azext_partnercenter/tests/latest/test_marketplace_application.py
index 47f6ae22..f151bfeb 100644
--- a/partnercenter/azext_partnercenter/tests/latest/test_marketplace_application.py
+++ b/partnercenter/azext_partnercenter/tests/latest/test_marketplace_application.py
@@ -8,8 +8,8 @@ def test_solution_template_creation(self):
         self._offer_listing_show()
         self._offer_listing_update()
 
-        self._offer_setup_show()
-        self._offer_setup_update()
+        # self._offer_setup_show()
+        # self._offer_setup_update()
 
         self._plan_create_solution_template()
         self._plan_listing_update()
@@ -21,8 +21,8 @@ def test_managed_app_creation(self):
         self._offer_listing_show()
         self._offer_listing_update()
 
-        self._offer_setup_show()
-        self._offer_setup_update()
+        # self._offer_setup_show()
+        # self._offer_setup_update()
 
         self._plan_create_managed_application()
         self._plan_listing_update()
@@ -54,13 +54,13 @@ def _offer_listing_update(self):
             ],
         )
 
-    def _offer_setup_show(self):
-        self.cmd("partnercenter marketplace offer setup show --offer-id {offer_id}")
+    # def _offer_setup_show(self):
+    #     self.cmd("partnercenter marketplace offer setup show --offer-id {offer_id}")
 
-    def _offer_setup_update(self):
-        self.cmd(
-            "partnercenter marketplace offer setup update --offer-id {offer_id}"
-        )
+    # def _offer_setup_update(self):
+    #     self.cmd(
+    #         "partnercenter marketplace offer setup update --offer-id {offer_id}"
+    #     )
 
     def _plan_create_solution_template(self):
         self.cmd(
diff --git a/partnercenter/azext_partnercenter/tests/latest/test_marketplace_offer_setup_scenario.py b/partnercenter/azext_partnercenter/tests/latest/test_marketplace_offer_setup_scenario.py
deleted file mode 100644
index 01144a16..00000000
--- a/partnercenter/azext_partnercenter/tests/latest/test_marketplace_offer_setup_scenario.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-
-from knack.util import CLIError
-from azext_partnercenter.models import OfferType
-from azext_partnercenter.tests.preparers import MarketplaceOfferPreparer
-from ..base import PartnerCenterScenarioTest
-
-
-class PartnerCenterMarketplaceOfferSetupScenarioTest(PartnerCenterScenarioTest):
-    def setUp(self):
-        self.cmd_delay = 5  # delay each cmd by 5 sec, default
-        super().setUp()
-
-    @MarketplaceOfferPreparer(offer_type=OfferType.AZURETHIRDPARTYVIRTUALMACHINE.value)
-    def test_marketplace_offer_setup_test_drive_on_vm_type(self):
-        self.cmd('partnercenter marketplace offer setup update --offer-id {offer_id} --test-drive {updated_test_drive}',
-                 checks=[self.check('testDrive', True)])
-
-    @MarketplaceOfferPreparer()
-    def test_marketplace_offer_setup(self):
-        self._offer_setup_show_returns_initial_default_values()
-
-        self.cmd('partnercenter marketplace offer setup update --offer-id {offer_id} --sell-through-microsoft {updated_sell_through_microsoft} --trial-uri {updated_trial_uri}',
-                 checks=[self.check('sellThroughMicrosoft', True),
-                         self.check('trialUri', '{updated_trial_uri}')])
-
-        self.cmd('partnercenter marketplace offer setup show --id {offer_id}',
-                 checks=[self.check('sellThroughMicrosoft', True),
-                         self.check('testDrive', False),
-                         self.check('trialUri', '{updated_trial_uri}')])
-
-        # should not allow Container offer type to test drive
-        with self.assertRaises(CLIError):
-            self.cmd('partnercenter marketplace offer setup update --id {offer_id} --test-drive true')
-
-    def _offer_setup_show_returns_initial_default_values(self):
-        result = self.cmd('partnercenter marketplace offer setup show --id {offer_id}').get_output_in_json()
-
-        self.assertTrue(result['reseller'])
-        self.assertTrue(result['sellThroughMicrosoft'])
-        self.assertFalse(result['testDrive'])
-        self.assertEqual('', result['trialUri'])
-
-    def init_args(self):
-        self.kwargs.update({
-            'updated_sell_through_microsoft': 'true',
-            'updated_test_drive': 'true',
-            'updated_trial_uri': 'https://updated.tria.uri/'
-        })
diff --git a/partnercenter/azext_partnercenter/vendored_sdks/openapitools.json b/partnercenter/azext_partnercenter/vendored_sdks/openapitools.json
index 9905b304..d29519f3 100644
--- a/partnercenter/azext_partnercenter/vendored_sdks/openapitools.json
+++ b/partnercenter/azext_partnercenter/vendored_sdks/openapitools.json
@@ -5,7 +5,7 @@
       "version": "6.0.1",
       "generators": {
         "v1": {
-          "inputSpec": "https://ingestionapi-swagger.azureedge.net/swagger.json",
+          "inputSpec": "https://ingestionapi-swagger.dps.mp.microsoft.com/swagger.json",
           "generatorName": "python",
           "output": "#{cwd}/v1/",
           "additionalProperties":{
@@ -20,4 +20,3 @@
       }
     }
   }
-  
\ No newline at end of file