@typespec/http-client-python 0.3.3 → 0.3.5

package/generator/test/azure/mock_api_tests/asynctests/{test_azure_arm_models_resource_async.py → test_azure_arm_resource_async.py}

@@ -4,8 +4,8 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from azure.resourcemanager.models.resources.aio import ResourcesClient
-from azure.resourcemanager.models.resources import models
+from azure.resourcemanager.resources.aio import ResourcesClient
+from azure.resourcemanager.resources import models
 
 SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
 RESOURCE_GROUP_NAME = "test-rg"
@@ -34,17 +34,17 @@ async def test_client_signature(credential, authentication_policy):
     )
     for client in [client1, client2]:
         # make sure signautre order is correct
-        await client.top_level_tracked_resources.get(RESOURCE_GROUP_NAME, "top")
+        await client.top_level.get(RESOURCE_GROUP_NAME, "top")
         # make sure signautre name is correct
-        await client.top_level_tracked_resources.get(
+        await client.top_level.get(
             resource_group_name=RESOURCE_GROUP_NAME, top_level_tracked_resource_name="top"
         )
 
 
 @pytest.mark.asyncio
-async def test_top_level_tracked_resources_begin_create_or_replace(client):
+async def test_top_level_begin_create_or_replace(client):
     result = await (
-        await client.top_level_tracked_resources.begin_create_or_replace(
+        await client.top_level.begin_create_or_replace(
             resource_group_name=RESOURCE_GROUP_NAME,
             top_level_tracked_resource_name="top",
             resource=models.TopLevelTrackedResource(
@@ -60,14 +60,14 @@ async def test_top_level_tracked_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "top"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_top_level_tracked_resources_begin_update(client):
+async def test_top_level_begin_update(client):
     result = await (
-        await client.top_level_tracked_resources.begin_update(
+        await client.top_level.begin_update(
             resource_group_name=RESOURCE_GROUP_NAME,
             top_level_tracked_resource_name="top",
             properties=models.TopLevelTrackedResource(
@@ -83,14 +83,14 @@ async def test_top_level_tracked_resources_begin_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "top"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_top_level_tracked_resources_begin_delete(client):
+async def test_top_level_begin_delete(client):
     await (
-        await client.top_level_tracked_resources.begin_delete(
+        await client.top_level.begin_delete(
             resource_group_name=RESOURCE_GROUP_NAME,
             top_level_tracked_resource_name="top",
             polling_interval=0,  # set polling_interval to 0 s to make the test faster since default is 30s
@@ -99,8 +99,8 @@ async def test_top_level_tracked_resources_begin_delete(client):
 
 
 @pytest.mark.asyncio
-async def test_top_level_tracked_resources_list_by_resource_group(client):
-    response = client.top_level_tracked_resources.list_by_resource_group(
+async def test_top_level_list_by_resource_group(client):
+    response = client.top_level.list_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     result = [r async for r in response]
@@ -109,26 +109,26 @@ async def test_top_level_tracked_resources_list_by_resource_group(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "top"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_top_level_tracked_resources_list_by_subscription(client):
-    response = client.top_level_tracked_resources.list_by_subscription()
+async def test_top_level_list_by_subscription(client):
+    response = client.top_level.list_by_subscription()
     result = [r async for r in response]
     for result in result:
         assert result.location == "eastus"
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "top"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_nested_proxy_resources_get(client):
-    result = await client.nested_proxy_resources.get(
+async def test_nested_get(client):
+    result = await client.nested.get(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -136,14 +136,14 @@ async def test_nested_proxy_resources_get(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_nested_proxy_resources_begin_create_or_replace(client):
+async def test_nested_begin_create_or_replace(client):
     result = await (
-        await client.nested_proxy_resources.begin_create_or_replace(
+        await client.nested.begin_create_or_replace(
             resource_group_name=RESOURCE_GROUP_NAME,
             top_level_tracked_resource_name="top",
             nexted_proxy_resource_name="nested",
@@ -158,14 +158,14 @@ async def test_nested_proxy_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_nested_proxy_resources_begin_update(client):
+async def test_nested_begin_update(client):
     result = await (
-        await client.nested_proxy_resources.begin_update(
+        await client.nested.begin_update(
             resource_group_name=RESOURCE_GROUP_NAME,
             top_level_tracked_resource_name="top",
             nexted_proxy_resource_name="nested",
@@ -180,14 +180,14 @@ async def test_nested_proxy_resources_begin_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_nested_proxy_resources_begin_delete(client):
+async def test_nested_begin_delete(client):
     await (
-        await client.nested_proxy_resources.begin_delete(
+        await client.nested.begin_delete(
             resource_group_name=RESOURCE_GROUP_NAME,
             top_level_tracked_resource_name="top",
             nexted_proxy_resource_name="nested",
@@ -197,8 +197,8 @@ async def test_nested_proxy_resources_begin_delete(client):
 
 
 @pytest.mark.asyncio
-async def test_nested_proxy_resources_list_by_top_level_tracked_resource(client):
-    response = client.nested_proxy_resources.list_by_top_level_tracked_resource(
+async def test_nested_list_by_top_level_tracked_resource(client):
+    response = client.nested.list_by_top_level_tracked_resource(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
     )
@@ -207,13 +207,13 @@ async def test_nested_proxy_resources_list_by_top_level_tracked_resource(client)
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "nested"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_top_level_tracked_resources_action_sync(client):
-    await client.top_level_tracked_resources.action_sync(
+async def test_top_level_action_sync(client):
+    await client.top_level.action_sync(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         body={"message": "Resource action at top level.", "urgent": True},
@@ -221,21 +221,21 @@ async def test_top_level_tracked_resources_action_sync(client):
 
 
 @pytest.mark.asyncio
-async def test_singleton_tracked_resources_get_by_resource_group(client):
-    result = await client.singleton_tracked_resources.get_by_resource_group(
+async def test_singleton_get_by_resource_group(client):
+    result = await client.singleton.get_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_singleton_tracked_resources_begin_create_or_replace(client):
+async def test_singleton_begin_create_or_replace(client):
     result = await (
-        await client.singleton_tracked_resources.begin_create_or_update(
+        await client.singleton.begin_create_or_update(
             resource_group_name=RESOURCE_GROUP_NAME,
             resource=models.SingletonTrackedResource(
                 location="eastus",
@@ -248,13 +248,13 @@ async def test_singleton_tracked_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_singleton_tracked_resources_update(client):
-    result = await client.singleton_tracked_resources.update(
+async def test_singleton_update(client):
+    result = await client.singleton.update(
         resource_group_name=RESOURCE_GROUP_NAME,
         properties=models.SingletonTrackedResource(
             location="eastus2",
@@ -266,13 +266,13 @@ async def test_singleton_tracked_resources_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
 @pytest.mark.asyncio
-async def test_singleton_tracked_resources_list_by_resource_group(client):
-    response = client.singleton_tracked_resources.list_by_resource_group(
+async def test_singleton_list_by_resource_group(client):
+    response = client.singleton.list_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     result = [r async for r in response]
@@ -280,5 +280,5 @@ async def test_singleton_tracked_resources_list_by_resource_group(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "default"
-        assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
         assert result.system_data.created_by == "AzureSDK"

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_access_async.py

@@ -16,67 +16,67 @@ async def client():
 
 @pytest.mark.asyncio
 async def test_no_decorator_in_public(client: AccessClient):
-    result = await client.public_operation.no_decorator_in_public(name="test")
-    assert result == models.NoDecoratorModelInPublic(name="test")
+    result = await client.public_operation.no_decorator_in_public(name="sample")
+    assert result == models.NoDecoratorModelInPublic(name="sample")
 
 
 @pytest.mark.asyncio
 async def test_public_decorator_in_public(client: AccessClient):
-    result = await client.public_operation.public_decorator_in_public(name="test")
-    assert result == models.PublicDecoratorModelInPublic(name="test")
+    result = await client.public_operation.public_decorator_in_public(name="sample")
+    assert result == models.PublicDecoratorModelInPublic(name="sample")
 
 
 @pytest.mark.asyncio
 async def test_no_decorator_in_internal(client: AccessClient):
-    result = await client.internal_operation._no_decorator_in_internal(name="test")
-    assert result == models._models.NoDecoratorModelInInternal(name="test")
+    result = await client.internal_operation._no_decorator_in_internal(name="sample")
+    assert result == models._models.NoDecoratorModelInInternal(name="sample")
 
     with pytest.raises(ImportError):
         from specs.azure.clientgenerator.core.access.models import NoDecoratorModelInInternal
 
     with pytest.raises(AttributeError):
-        await client.internal_operation.no_decorator_in_internal(name="test")
+        await client.internal_operation.no_decorator_in_internal(name="sample")
 
 
 @pytest.mark.asyncio
 async def test_internal_decorator_in_internal(client: AccessClient):
-    result = await client.internal_operation._internal_decorator_in_internal(name="test")
-    assert result == models._models.InternalDecoratorModelInInternal(name="test")
+    result = await client.internal_operation._internal_decorator_in_internal(name="sample")
+    assert result == models._models.InternalDecoratorModelInInternal(name="sample")
 
     with pytest.raises(ImportError):
         from specs.azure.clientgenerator.core.access.models import InternalDecoratorModelInInternal
 
     with pytest.raises(AttributeError):
-        await client.internal_operation.internal_decorator_in_internal(name="test")
+        await client.internal_operation.internal_decorator_in_internal(name="sample")
 
 
 @pytest.mark.asyncio
 async def test_public_decorator_in_internal(client: AccessClient):
-    result = await client.internal_operation._public_decorator_in_internal(name="test")
-    assert result == models.PublicDecoratorModelInInternal(name="test")
+    result = await client.internal_operation._public_decorator_in_internal(name="sample")
+    assert result == models.PublicDecoratorModelInInternal(name="sample")
 
     with pytest.raises(AttributeError):
-        await client.internal_operation.public_decorator_in_internal(name="test")
+        await client.internal_operation.public_decorator_in_internal(name="sample")
 
 
 @pytest.mark.asyncio
 async def test_public(client: AccessClient):
-    result = await client.shared_model_in_operation.public(name="test")
-    assert result == models.SharedModel(name="test")
+    result = await client.shared_model_in_operation.public(name="sample")
+    assert result == models.SharedModel(name="sample")
 
 
 @pytest.mark.asyncio
 async def test_internal(client: AccessClient):
-    result = await client.shared_model_in_operation._internal(name="test")
-    assert result == models.SharedModel(name="test")
+    result = await client.shared_model_in_operation._internal(name="sample")
+    assert result == models.SharedModel(name="sample")
 
     with pytest.raises(AttributeError):
-        await client.shared_model_in_operation.internal(name="test")
+        await client.shared_model_in_operation.internal(name="sample")
 
 
 @pytest.mark.asyncio
 async def test_operation(client: AccessClient):
-    result = await client.relative_model_in_operation._operation(name="test")
+    result = await client.relative_model_in_operation._operation(name="Madge")
     assert result == models._models.OuterModel(name="Madge", inner=models._models.InnerModel(name="Madge"))
 
     with pytest.raises(ImportError):
@@ -86,7 +86,7 @@ async def test_operation(client: AccessClient):
         from specs.azure.clientgenerator.core.access.models import InnerModel
 
     with pytest.raises(AttributeError):
-        await client.shared_model_in_operation.operation(name="test")
+        await client.shared_model_in_operation.operation(name="Madge")
 
 
 @pytest.mark.asyncio

package/generator/test/azure/mock_api_tests/{test_azure_arm_models_common_types_managed_identity.py → test_azure_arm_commonproperties.py}

@@ -4,8 +4,8 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from azure.resourcemanager.models.commontypes.managedidentity import ManagedIdentityClient
-from azure.resourcemanager.models.commontypes.managedidentity import models
+from azure.resourcemanager.commonproperties import CommonPropertiesClient
+from azure.resourcemanager.commonproperties import models
 
 SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
 RESOURCE_GROUP_NAME = "test-rg"
@@ -13,14 +13,14 @@ RESOURCE_GROUP_NAME = "test-rg"
 
 @pytest.fixture
 def client(credential, authentication_policy):
-    with ManagedIdentityClient(
+    with CommonPropertiesClient(
         credential, SUBSCRIPTION_ID, "http://localhost:3000", authentication_policy=authentication_policy
     ) as client:
         yield client
 
 
-def test_managed_identity_tracked_resources_get(client):
-    result = client.managed_identity_tracked_resources.get(
+def test_managed_identity_get(client):
+    result = client.managed_identity.get(
         resource_group_name=RESOURCE_GROUP_NAME, managed_identity_tracked_resource_name="identity"
     )
     assert result.location == "eastus"
@@ -28,8 +28,8 @@ def test_managed_identity_tracked_resources_get(client):
     assert result.properties.provisioning_state == "Succeeded"
 
 
-def test_managed_identity_tracked_resources_create_with_system_assigned(client):
-    result = client.managed_identity_tracked_resources.create_with_system_assigned(
+def test_managed_identity_create_with_system_assigned(client):
+    result = client.managed_identity.create_with_system_assigned(
         resource_group_name=RESOURCE_GROUP_NAME,
         managed_identity_tracked_resource_name="identity",
         resource=models.ManagedIdentityTrackedResource(
@@ -41,8 +41,8 @@ def test_managed_identity_tracked_resources_create_with_system_assigned(client):
     assert result.properties.provisioning_state == "Succeeded"
 
 
-def test_managed_identity_tracked_resources_update_with_user_assigned_and_system_assigned(client):
-    result = client.managed_identity_tracked_resources.update_with_user_assigned_and_system_assigned(
+def test_managed_identity_update_with_user_assigned_and_system_assigned(client):
+    result = client.managed_identity.update_with_user_assigned_and_system_assigned(
         resource_group_name=RESOURCE_GROUP_NAME,
         managed_identity_tracked_resource_name="identity",
         properties=models.ManagedIdentityTrackedResource(

package/generator/test/azure/mock_api_tests/{test_azure_arm_models_resource.py → test_azure_arm_resource.py}

@@ -4,8 +4,8 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from azure.resourcemanager.models.resources import ResourcesClient
-from azure.resourcemanager.models.resources import models
+from azure.resourcemanager.resources import ResourcesClient
+from azure.resourcemanager.resources import models
 
 SUBSCRIPTION_ID = "00000000-0000-0000-0000-000000000000"
 RESOURCE_GROUP_NAME = "test-rg"
@@ -33,15 +33,15 @@ def test_client_signature(credential, authentication_policy):
     )
     for client in [client1, client2]:
         # make sure signautre order is correct
-        client.top_level_tracked_resources.get(RESOURCE_GROUP_NAME, "top")
+        client.top_level.get(RESOURCE_GROUP_NAME, "top")
         # make sure signautre name is correct
-        client.top_level_tracked_resources.get(
+        client.top_level.get(
             resource_group_name=RESOURCE_GROUP_NAME, top_level_tracked_resource_name="top"
         )
 
 
-def test_top_level_tracked_resources_begin_create_or_replace(client):
-    result = client.top_level_tracked_resources.begin_create_or_replace(
+def test_top_level_begin_create_or_replace(client):
+    result = client.top_level.begin_create_or_replace(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         resource=models.TopLevelTrackedResource(
@@ -56,12 +56,12 @@ def test_top_level_tracked_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "top"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_begin_update(client):
-    result = client.top_level_tracked_resources.begin_update(
+def test_top_level_begin_update(client):
+    result = client.top_level.begin_update(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         properties=models.TopLevelTrackedResource(
@@ -76,20 +76,20 @@ def test_top_level_tracked_resources_begin_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "top"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_begin_delete(client):
-    client.top_level_tracked_resources.begin_delete(
+def test_top_level_begin_delete(client):
+    client.top_level.begin_delete(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         polling_interval=0,  # set polling_interval to 0 s to make the test faster since default is 30s
     ).result()
 
 
-def test_top_level_tracked_resources_list_by_resource_group(client):
-    response = client.top_level_tracked_resources.list_by_resource_group(
+def test_top_level_list_by_resource_group(client):
+    response = client.top_level.list_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     result = [r for r in response]
@@ -98,24 +98,24 @@ def test_top_level_tracked_resources_list_by_resource_group(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "top"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_list_by_subscription(client):
-    response = client.top_level_tracked_resources.list_by_subscription()
+def test_top_level_list_by_subscription(client):
+    response = client.top_level.list_by_subscription()
     result = [r for r in response]
     for result in result:
         assert result.location == "eastus"
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "top"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_get(client):
-    result = client.nested_proxy_resources.get(
+def test_nested_get(client):
+    result = client.nested.get(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -123,12 +123,12 @@ def test_nested_proxy_resources_get(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_begin_create_or_replace(client):
-    result = client.nested_proxy_resources.begin_create_or_replace(
+def test_nested_begin_create_or_replace(client):
+    result = client.nested.begin_create_or_replace(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -142,12 +142,12 @@ def test_nested_proxy_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_begin_update(client):
-    result = client.nested_proxy_resources.begin_update(
+def test_nested_begin_update(client):
+    result = client.nested.begin_update(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -161,12 +161,12 @@ def test_nested_proxy_resources_begin_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "nested"
-    assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+    assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_nested_proxy_resources_begin_delete(client):
-    client.nested_proxy_resources.begin_delete(
+def test_nested_begin_delete(client):
+    client.nested.begin_delete(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         nexted_proxy_resource_name="nested",
@@ -174,8 +174,8 @@ def test_nested_proxy_resources_begin_delete(client):
     ).result()
 
 
-def test_nested_proxy_resources_list_by_top_level_tracked_resource(client):
-    response = client.nested_proxy_resources.list_by_top_level_tracked_resource(
+def test_nested_list_by_top_level_tracked_resource(client):
+    response = client.nested.list_by_top_level_tracked_resource(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
     )
@@ -184,31 +184,31 @@ def test_nested_proxy_resources_list_by_top_level_tracked_resource(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "nested"
-        assert result.type == "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources"
+        assert result.type == "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources"
         assert result.system_data.created_by == "AzureSDK"
 
 
-def test_top_level_tracked_resources_action_sync(client):
-    client.top_level_tracked_resources.action_sync(
+def test_top_level_action_sync(client):
+    client.top_level.action_sync(
         resource_group_name=RESOURCE_GROUP_NAME,
         top_level_tracked_resource_name="top",
         body={"message": "Resource action at top level.", "urgent": True},
     )
 
 
-def test_singleton_tracked_resources_get_by_resource_group(client):
-    result = client.singleton_tracked_resources.get_by_resource_group(
+def test_singleton_get_by_resource_group(client):
+    result = client.singleton.get_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_singleton_tracked_resources_begin_create_or_replace(client):
-    result = client.singleton_tracked_resources.begin_create_or_update(
+def test_singleton_begin_create_or_replace(client):
+    result = client.singleton.begin_create_or_update(
         resource_group_name=RESOURCE_GROUP_NAME,
         resource=models.SingletonTrackedResource(
             location="eastus",
@@ -220,12 +220,12 @@ def test_singleton_tracked_resources_begin_create_or_replace(client):
     assert result.properties.description == "valid"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_singleton_tracked_resources_update(client):
-    result = client.singleton_tracked_resources.update(
+def test_singleton_update(client):
+    result = client.singleton.update(
         resource_group_name=RESOURCE_GROUP_NAME,
         properties=models.SingletonTrackedResource(
             location="eastus2",
@@ -237,12 +237,12 @@ def test_singleton_tracked_resources_update(client):
     assert result.properties.description == "valid2"
     assert result.properties.provisioning_state == "Succeeded"
     assert result.name == "default"
-    assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+    assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
     assert result.system_data.created_by == "AzureSDK"
 
 
-def test_singleton_tracked_resources_list_by_resource_group(client):
-    response = client.singleton_tracked_resources.list_by_resource_group(
+def test_singleton_list_by_resource_group(client):
+    response = client.singleton.list_by_resource_group(
         resource_group_name=RESOURCE_GROUP_NAME,
     )
     result = [r for r in response]
@@ -250,5 +250,5 @@ def test_singleton_tracked_resources_list_by_resource_group(client):
         assert result.properties.description == "valid"
         assert result.properties.provisioning_state == "Succeeded"
         assert result.name == "default"
-        assert result.type == "Azure.ResourceManager.Models.Resources/singletonTrackedResources"
+        assert result.type == "Azure.ResourceManager.Resources/singletonTrackedResources"
         assert result.system_data.created_by == "AzureSDK"