add back resource suffix when property bag comes from extension method (#3052)

Co-authored-by: Dapeng Zhang <[email protected]>

Author: Yao725

samples/Azure.ResourceManager.Sample/Generated/Extensions/SampleExtensions.cs

@@ -348,7 +348,7 @@ public static Response<VirtualMachineImage> GetVirtualMachineImage(this Subscrip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="options"/> is null. </exception>
         /// <returns> An async collection of <see cref="VirtualMachineImageResource" /> that may take multiple service requests to iterate over. </returns>
-        public static AsyncPageable<VirtualMachineImageResource> GetVirtualMachineImagesAsync(this SubscriptionResource subscriptionResource, SubscriptionGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
+        public static AsyncPageable<VirtualMachineImageResource> GetVirtualMachineImagesAsync(this SubscriptionResource subscriptionResource, SubscriptionResourceGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(options, nameof(options));
 
@@ -373,7 +373,7 @@ public static AsyncPageable<VirtualMachineImageResource> GetVirtualMachineImages
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="options"/> is null. </exception>
         /// <returns> A collection of <see cref="VirtualMachineImageResource" /> that may take multiple service requests to iterate over. </returns>
-        public static Pageable<VirtualMachineImageResource> GetVirtualMachineImages(this SubscriptionResource subscriptionResource, SubscriptionGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
+        public static Pageable<VirtualMachineImageResource> GetVirtualMachineImages(this SubscriptionResource subscriptionResource, SubscriptionResourceGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(options, nameof(options));
 

samples/Azure.ResourceManager.Sample/Generated/Extensions/SubscriptionResourceExtensionClient.cs

@@ -356,7 +356,7 @@ public virtual Response<VirtualMachineImage> GetVirtualMachineImage(AzureLocatio
         /// <param name="options"> A property bag which contains all the parameters of this method except the LRO qualifier and request context parameter. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <returns> An async collection of <see cref="VirtualMachineImageResource" /> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<VirtualMachineImageResource> GetVirtualMachineImagesAsync(SubscriptionGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
+        public virtual AsyncPageable<VirtualMachineImageResource> GetVirtualMachineImagesAsync(SubscriptionResourceGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => VirtualMachineImagesRestClient.CreateListRequest(Id.SubscriptionId, options.Location, options.PublisherName, options.Offer, options.Skus, options.Expand, options.Top, options.Orderby);
             return PageableHelpers.CreateAsyncPageable(FirstPageRequest, null, VirtualMachineImageResource.DeserializeVirtualMachineImageResource, VirtualMachineImagesClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetVirtualMachineImages", "", null, cancellationToken);
@@ -378,7 +378,7 @@ public virtual AsyncPageable<VirtualMachineImageResource> GetVirtualMachineImage
         /// <param name="options"> A property bag which contains all the parameters of this method except the LRO qualifier and request context parameter. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <returns> A collection of <see cref="VirtualMachineImageResource" /> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<VirtualMachineImageResource> GetVirtualMachineImages(SubscriptionGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
+        public virtual Pageable<VirtualMachineImageResource> GetVirtualMachineImages(SubscriptionResourceGetVirtualMachineImagesOptions options, CancellationToken cancellationToken = default)
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => VirtualMachineImagesRestClient.CreateListRequest(Id.SubscriptionId, options.Location, options.PublisherName, options.Offer, options.Skus, options.Expand, options.Top, options.Orderby);
             return PageableHelpers.CreatePageable(FirstPageRequest, null, VirtualMachineImageResource.DeserializeVirtualMachineImageResource, VirtualMachineImagesClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetVirtualMachineImages", "", null, cancellationToken);

samples/Azure.ResourceManager.Sample/Generated/Models/SubscriptionGetVirtualMachineImagesOptions.cs renamed to samples/Azure.ResourceManager.Sample/Generated/Models/SubscriptionResourceGetVirtualMachineImagesOptions.cs

@@ -10,16 +10,16 @@
 
 namespace Azure.ResourceManager.Sample.Models
 {
-    /// <summary> The SubscriptionGetVirtualMachineImagesOptions. </summary>
-    public partial class SubscriptionGetVirtualMachineImagesOptions
+    /// <summary> The SubscriptionResourceGetVirtualMachineImagesOptions. </summary>
+    public partial class SubscriptionResourceGetVirtualMachineImagesOptions
     {
-        /// <summary> Initializes a new instance of SubscriptionGetVirtualMachineImagesOptions. </summary>
+        /// <summary> Initializes a new instance of SubscriptionResourceGetVirtualMachineImagesOptions. </summary>
         /// <param name="location"> The name of a supported Azure region. </param>
         /// <param name="publisherName"> A valid image publisher. </param>
         /// <param name="offer"> A valid image publisher offer. </param>
         /// <param name="skus"> A valid image SKU. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="publisherName"/>, <paramref name="offer"/> or <paramref name="skus"/> is null. </exception>
-        public SubscriptionGetVirtualMachineImagesOptions(AzureLocation location, string publisherName, string offer, string skus)
+        public SubscriptionResourceGetVirtualMachineImagesOptions(AzureLocation location, string publisherName, string offer, string skus)
         {
             Argument.AssertNotNull(publisherName, nameof(publisherName));
             Argument.AssertNotNull(offer, nameof(offer));

src/AutoRest.CSharp/Mgmt/Output/MgmtExtensionClient.cs

@@ -46,15 +46,13 @@ protected override IEnumerable<MgmtClientOperation> EnsureAllOperations()
                 var operationName = Extension.GetOperationName(operation);
                 // TODO -- these logic needs a thorough refactor -- the values MgmtRestOperation consumes here are actually coupled together, some of the values are calculated multiple times (here and in writers).
                 // we just leave this implementation here since it could work for now
-                int resourceIndex = ResourceName.IndexOf("Resource");
-                var entityName = resourceIndex > 0 ? ResourceName.Substring(0, resourceIndex) : ResourceName;
                 return MgmtClientOperation.FromOperation(
                     new MgmtRestOperation(
                         operation,
                         operation.GetRequestPath(),
                         Extension.ContextualPath,
                         operationName,
-                        propertyBagName: entityName));
+                        propertyBagName: ResourceName));
             });
         }
 

src/AutoRest.CSharp/Mgmt/Output/MgmtExtensions.cs

@@ -86,15 +86,13 @@ protected override IEnumerable<MgmtClientOperation> EnsureClientOperations()
                 // TODO -- these logic needs a thorough refactor -- the values MgmtRestOperation consumes here are actually coupled together
                 // some of the values are calculated multiple times (here and in writers).
                 // we just leave this implementation here since it could work for now
-                int resourceIndex = ResourceName.IndexOf("Resource");
-                var entityName = resourceIndex > 0 ? ResourceName.Substring(0, resourceIndex) : ResourceName;
                 return MgmtClientOperation.FromOperation(
                     new MgmtRestOperation(
                         operation,
                         operation.GetRequestPath(),
                         ContextualPath,
                         operationName,
-                        propertyBagName: entityName),
+                        propertyBagName: ResourceName),
                     extensionParamToUse);
             });
         }