updated SDK to align with service (Azure#47540)

juntuchen-msft · web-flow · commit 1eaa696a1fd3 · 2024-12-14T00:56:39.000Z
* updated SDK to align with service * .NET SDK Export API bash command * updated API * Revert ".NET SDK Export API bash command" This reverts commit 15b996a.
diff --git a/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.net8.0.cs b/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.net8.0.cs
@@ -131,7 +131,6 @@ public CallAutomationClient(string connectionString, Azure.Communication.CallAut
         public CallAutomationClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.Communication.CallAutomation.CallAutomationClientOptions options = null) { }
         public CallAutomationClient(System.Uri pmaEndpoint, string connectionString, Azure.Communication.CallAutomation.CallAutomationClientOptions options = null) { }
         public CallAutomationClient(System.Uri pmaEndpoint, System.Uri acsEndpoint, Azure.Core.TokenCredential credential, Azure.Communication.CallAutomation.CallAutomationClientOptions options = null) { }
-        public Azure.Communication.MicrosoftTeamsAppIdentifier OPSSource { get { throw null; } }
         public Azure.Communication.CommunicationUserIdentifier Source { get { throw null; } }
         public virtual Azure.Response<Azure.Communication.CallAutomation.AnswerCallResult> AnswerCall(Azure.Communication.CallAutomation.AnswerCallOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Communication.CallAutomation.AnswerCallResult> AnswerCall(string incomingCallContext, System.Uri callbackUri, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -162,7 +161,6 @@ public CallAutomationClient(System.Uri pmaEndpoint, System.Uri acsEndpoint, Azur
     public partial class CallAutomationClientOptions : Azure.Core.ClientOptions
     {
         public CallAutomationClientOptions(Azure.Communication.CallAutomation.CallAutomationClientOptions.ServiceVersion version = Azure.Communication.CallAutomation.CallAutomationClientOptions.ServiceVersion.V2024_09_01_Preview) { }
-        public Azure.Communication.MicrosoftTeamsAppIdentifier OPSSource { get { throw null; } set { } }
         public Azure.Communication.CommunicationUserIdentifier Source { get { throw null; } set { } }
         public enum ServiceVersion
         {
@@ -709,6 +707,7 @@ public CreateCallOptions(Azure.Communication.CallAutomation.CallInvite callInvit
         public Azure.Communication.CallAutomation.CallInvite CallInvite { get { throw null; } }
         public Azure.Communication.CallAutomation.MediaStreamingOptions MediaStreamingOptions { get { throw null; } set { } }
         public string OperationContext { get { throw null; } set { } }
+        public Azure.Communication.MicrosoftTeamsAppIdentifier TeamsAppSource { get { throw null; } set { } }
         public Azure.Communication.CallAutomation.TranscriptionOptions TranscriptionOptions { get { throw null; } set { } }
     }
     public partial class CreateCallResult
@@ -730,6 +729,7 @@ public CreateGroupCallOptions(System.Collections.Generic.IEnumerable<Azure.Commu
         public Azure.Communication.PhoneNumberIdentifier SourceCallerIdNumber { get { throw null; } set { } }
         public string SourceDisplayName { get { throw null; } set { } }
         public System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> Targets { get { throw null; } }
+        public Azure.Communication.MicrosoftTeamsAppIdentifier TeamsAppSource { get { throw null; } set { } }
         public Azure.Communication.CallAutomation.TranscriptionOptions TranscriptionOptions { get { throw null; } set { } }
     }
     public partial class CustomCallingContext
diff --git a/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs b/sdk/communication/Azure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
@@ -131,7 +131,6 @@ public CallAutomationClient(string connectionString, Azure.Communication.CallAut
         public CallAutomationClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.Communication.CallAutomation.CallAutomationClientOptions options = null) { }
         public CallAutomationClient(System.Uri pmaEndpoint, string connectionString, Azure.Communication.CallAutomation.CallAutomationClientOptions options = null) { }
         public CallAutomationClient(System.Uri pmaEndpoint, System.Uri acsEndpoint, Azure.Core.TokenCredential credential, Azure.Communication.CallAutomation.CallAutomationClientOptions options = null) { }
-        public Azure.Communication.MicrosoftTeamsAppIdentifier OPSSource { get { throw null; } }
         public Azure.Communication.CommunicationUserIdentifier Source { get { throw null; } }
         public virtual Azure.Response<Azure.Communication.CallAutomation.AnswerCallResult> AnswerCall(Azure.Communication.CallAutomation.AnswerCallOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Communication.CallAutomation.AnswerCallResult> AnswerCall(string incomingCallContext, System.Uri callbackUri, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -162,7 +161,6 @@ public CallAutomationClient(System.Uri pmaEndpoint, System.Uri acsEndpoint, Azur
     public partial class CallAutomationClientOptions : Azure.Core.ClientOptions
     {
         public CallAutomationClientOptions(Azure.Communication.CallAutomation.CallAutomationClientOptions.ServiceVersion version = Azure.Communication.CallAutomation.CallAutomationClientOptions.ServiceVersion.V2024_09_01_Preview) { }
-        public Azure.Communication.MicrosoftTeamsAppIdentifier OPSSource { get { throw null; } set { } }
         public Azure.Communication.CommunicationUserIdentifier Source { get { throw null; } set { } }
         public enum ServiceVersion
         {
@@ -708,6 +706,7 @@ public CreateCallOptions(Azure.Communication.CallAutomation.CallInvite callInvit
         public Azure.Communication.CallAutomation.CallInvite CallInvite { get { throw null; } }
         public Azure.Communication.CallAutomation.MediaStreamingOptions MediaStreamingOptions { get { throw null; } set { } }
         public string OperationContext { get { throw null; } set { } }
+        public Azure.Communication.MicrosoftTeamsAppIdentifier TeamsAppSource { get { throw null; } set { } }
         public Azure.Communication.CallAutomation.TranscriptionOptions TranscriptionOptions { get { throw null; } set { } }
     }
     public partial class CreateCallResult
@@ -729,6 +728,7 @@ public CreateGroupCallOptions(System.Collections.Generic.IEnumerable<Azure.Commu
         public Azure.Communication.PhoneNumberIdentifier SourceCallerIdNumber { get { throw null; } set { } }
         public string SourceDisplayName { get { throw null; } set { } }
         public System.Collections.Generic.IEnumerable<Azure.Communication.CommunicationIdentifier> Targets { get { throw null; } }
+        public Azure.Communication.MicrosoftTeamsAppIdentifier TeamsAppSource { get { throw null; } set { } }
         public Azure.Communication.CallAutomation.TranscriptionOptions TranscriptionOptions { get { throw null; } set { } }
     }
     public partial class CustomCallingContext
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
@@ -9,7 +9,6 @@
 using Azure.Core.Pipeline;
 using Azure.Communication.Pipeline;
 using System.Collections.Generic;
-using System.Net;
 
 namespace Azure.Communication.CallAutomation
 {
@@ -36,14 +35,6 @@ public class CallAutomationClient
         /// </summary>
         public CommunicationUserIdentifier Source { get; }
 
-        /// <summary>
-        /// MicrosoftTeamsAppIdentifier that makes the outbound call.
-        /// This can be provided by providing CallAutomationClientOption during construction of CallAutomationClient.
-        /// If left blank, Source is the default outbound call identity.
-        /// This should be mutual exclusive with Source.
-        /// </summary>
-        public MicrosoftTeamsAppIdentifier OPSSource { get; }
-
         #region public constructors
         /// <summary> Initializes a new instance of <see cref="CallAutomationClient"/>.</summary>
         /// <param name="connectionString">Connection string acquired from the Azure Communication Services resource.</param>
@@ -127,7 +118,6 @@ private CallAutomationClient(Uri endpoint, HttpPipeline httpPipeline, CallAutoma
             CallDialogRestClient = new CallDialogRestClient(_clientDiagnostics, httpPipeline, endpoint, options.ApiVersion);
             EventProcessor = new CallAutomationEventProcessor();
             Source = options.Source;
-            OPSSource = options.OPSSource;
         }
 
         private CallAutomationClient(
@@ -733,7 +723,7 @@ private CreateCallRequestInternal CreateCallRequest(CreateCallOptions options)
                     : new PhoneNumberIdentifierModel(options?.CallInvite?.SourceCallerIdNumber?.PhoneNumber),
                 SourceDisplayName = options?.CallInvite?.SourceDisplayName,
                 Source = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id),
-                OpsSource = OPSSource == null ? null : new MicrosoftTeamsAppIdentifierModel(OPSSource.AppId),
+                TeamsAppSource = options.TeamsAppSource == null ? null : new MicrosoftTeamsAppIdentifierModel(options.TeamsAppSource.AppId),
             };
 
             request.CustomCallingContext = new CustomCallingContextInternal(
@@ -768,7 +758,7 @@ private CreateCallRequestInternal CreateCallRequest(CreateGroupCallOptions optio
                     : new PhoneNumberIdentifierModel(options?.SourceCallerIdNumber?.PhoneNumber),
                 SourceDisplayName = options?.SourceDisplayName,
                 Source = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id),
-                OpsSource = OPSSource == null ? null : new MicrosoftTeamsAppIdentifierModel(OPSSource.AppId)
+                TeamsAppSource = options.TeamsAppSource == null ? null : new MicrosoftTeamsAppIdentifierModel(options.TeamsAppSource.AppId)
             };
 
             request.CustomCallingContext = new CustomCallingContextInternal(
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClientOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClientOptions.cs
@@ -22,16 +22,9 @@ public class CallAutomationClientOptions : ClientOptions
 
         /// <summary>
         /// The caller source of the call automation client.
-        /// Mutual exclusive with <see cref="OPSSource"/>.
         /// </summary>
         public CommunicationUserIdentifier Source { get; set; }
 
-        /// <summary>
-        /// The One Phone System caller source of the call automation client.
-        /// Mutual exclusive with <see cref="Source"/>.
-        /// </summary>
-        public MicrosoftTeamsAppIdentifier OPSSource { get; set; }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="CallAutomationClientOptions"/>.
         /// </summary>
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/CreateCallRequestInternal.Serialization.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/CreateCallRequestInternal.Serialization.cs
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/CreateCallRequestInternal.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Generated/Models/CreateCallRequestInternal.cs
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CallInvite.cs
@@ -12,6 +12,7 @@ public class CallInvite
     {
         /// <summary>
         /// Creates a new CallInvite object.
+        /// When the source of the call is a Teams App source, callerIdNumber is not supported and should be null.
         /// </summary>
         /// <param name="targetPhoneNumberIdentity"></param>
         /// <param name="callerIdNumber"></param>
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateCallOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateCallOptions.cs
@@ -49,5 +49,12 @@ public CreateCallOptions(CallInvite callInvite, Uri callbackUri)
         /// AI options for the call such as endpoint URI of the Azure Cognitive Services resource
         /// </summary>
         public CallIntelligenceOptions CallIntelligenceOptions { get; set; }
+
+        /// <summary>
+        /// Overrides default client source by a MicrosoftTeamsAppIdentifier type source.
+        /// Required for creating call with Teams resource account ID.
+        /// This is per-operation setting and does not change the client's default source.
+        /// </summary>
+        public MicrosoftTeamsAppIdentifier TeamsAppSource { get; set; }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs b/sdk/communication/Azure.Communication.CallAutomation/src/Models/CreateGroupCallOptions.cs
@@ -66,5 +66,12 @@ public CreateGroupCallOptions(IEnumerable<CommunicationIdentifier> targets, Uri
         /// The Custom Context which contains SIP and voip headers.
         /// </summary>
         public CustomCallingContext CustomCallingContext { get; }
+
+        /// <summary>
+        /// Overrides default client source by a MicrosoftTeamsAppIdentifier type source.
+        /// Required for creating call with Teams resource account ID.
+        /// This is per-operation setting and does not change the client's default source.
+        /// </summary>
+        public MicrosoftTeamsAppIdentifier TeamsAppSource { get; set; }
     }
 }
diff --git a/sdk/communication/Azure.Communication.CallAutomation/src/autorest.md b/sdk/communication/Azure.Communication.CallAutomation/src/autorest.md
@@ -10,7 +10,7 @@ model-namespace: false
 tag: package-2024-09-01-preview
 
 require:
-    - https://github.com/Azure/azure-rest-api-specs/blob/b9e2d84df17975c0269246afb701eeba545958d0/specification/communication/data-plane/CallAutomation/readme.md
+    - https://github.com/Azure/azure-rest-api-specs/blob/691fea3efb9ff22b20904e92d5116223f452a3b1/specification/communication/data-plane/CallAutomation/readme.md
 
 
 title: Azure Communication Services
diff --git a/sdk/communication/Azure.Communication.CallAutomation/tests/CallAutomationClients/CallAutomationClientTests.cs b/sdk/communication/Azure.Communication.CallAutomation/tests/CallAutomationClients/CallAutomationClientTests.cs
@@ -279,6 +279,44 @@ public void CreateCallWithOptions_201Created(CallInvite target, Uri callbackUri)
             Assert.NotNull(response.Value.CallConnectionProperties.TranscriptionSubscription);
         }
 
+        [TestCaseSource(nameof(TestData_CreateCall))]
+        public async Task CreateCallWithTeamsAppSourceAsync_201Created(CallInvite target, Uri callbackUri)
+        {
+            CallAutomationClient callAutomationClient = CreateMockCallAutomationClient(201, CreateOrAnswerCallOrGetCallConnectionPayloadWithTeamsAppSource);
+            CreateCallOptions options = new CreateCallOptions(
+                callInvite: target,
+                callbackUri: callbackUri)
+            {
+                TeamsAppSource = new MicrosoftTeamsAppIdentifier("teamsAppId")
+            };
+
+            var response = await callAutomationClient.CreateCallAsync(options).ConfigureAwait(false);
+            CreateCallResult result = (CreateCallResult)response;
+            Assert.NotNull(result);
+            Assert.AreEqual((int)HttpStatusCode.Created, response.GetRawResponse().Status);
+            verifyOPSCallConnectionProperties(result.CallConnectionProperties);
+            Assert.AreEqual(CallConnectionId, result.CallConnection.CallConnectionId);
+        }
+
+        [TestCaseSource(nameof(TestData_CreateCall))]
+        public void CreateCallWithTeamsAppSource_201Created(CallInvite target, Uri callbackUri)
+        {
+            CallAutomationClient callAutomationClient = CreateMockCallAutomationClient(201, CreateOrAnswerCallOrGetCallConnectionPayloadWithTeamsAppSource);
+            CreateCallOptions options = new CreateCallOptions(
+                callInvite: target,
+                callbackUri: callbackUri)
+            {
+                TeamsAppSource = new MicrosoftTeamsAppIdentifier("teamsAppId")
+            };
+
+            var response = callAutomationClient.CreateCall(options);
+            CreateCallResult result = (CreateCallResult)response;
+            Assert.NotNull(result);
+            Assert.AreEqual((int)HttpStatusCode.Created, response.GetRawResponse().Status);
+            verifyOPSCallConnectionProperties(result.CallConnectionProperties);
+            Assert.AreEqual(CallConnectionId, result.CallConnection.CallConnectionId);
+        }
+
         [TestCaseSource(nameof(TestData_CreateCall))]
         public void CreateCallAsync_404NotFound(CallInvite target, Uri callbackUri)
         {
diff --git a/sdk/communication/Azure.Communication.CallAutomation/tests/Infrastructure/CallAutomationTestBase.cs b/sdk/communication/Azure.Communication.CallAutomation/tests/Infrastructure/CallAutomationTestBase.cs
diff --git a/sdk/communication/Azure.Communication.JobRouter/samples/Sample3_SimpleDistributionAsync.md b/sdk/communication/Azure.Communication.JobRouter/samples/Sample3_SimpleDistributionAsync.md

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class CallInvite`
`12`	`12`	`{`
`13`	`13`	`/// <summary>`
`14`	`14`	`/// Creates a new CallInvite object.`
	`15`	`+ /// When the source of the call is a Teams App source, callerIdNumber is not supported and should be null.`
`15`	`16`	`/// </summary>`
`16`	`17`	`/// <param name="targetPhoneNumberIdentity"></param>`
`17`	`18`	`/// <param name="callerIdNumber"></param>`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,12 @@ public CreateCallOptions(CallInvite callInvite, Uri callbackUri)`
`49`	`49`	`/// AI options for the call such as endpoint URI of the Azure Cognitive Services resource`
`50`	`50`	`/// </summary>`
`51`	`51`	`public CallIntelligenceOptions CallIntelligenceOptions { get; set; }`
	`52`	`+`
	`53`	`+ /// <summary>`
	`54`	`+ /// Overrides default client source by a MicrosoftTeamsAppIdentifier type source.`
	`55`	`+ /// Required for creating call with Teams resource account ID.`
	`56`	`+ /// This is per-operation setting and does not change the client's default source.`
	`57`	`+ /// </summary>`
	`58`	`+ public MicrosoftTeamsAppIdentifier TeamsAppSource { get; set; }`
`52`	`59`	`}`
`53`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,12 @@ public CreateGroupCallOptions(IEnumerable<CommunicationIdentifier> targets, Uri`
`66`	`66`	`/// The Custom Context which contains SIP and voip headers.`
`67`	`67`	`/// </summary>`
`68`	`68`	`public CustomCallingContext CustomCallingContext { get; }`
	`69`	`+`
	`70`	`+ /// <summary>`
	`71`	`+ /// Overrides default client source by a MicrosoftTeamsAppIdentifier type source.`
	`72`	`+ /// Required for creating call with Teams resource account ID.`
	`73`	`+ /// This is per-operation setting and does not change the client's default source.`
	`74`	`+ /// </summary>`
	`75`	`+ public MicrosoftTeamsAppIdentifier TeamsAppSource { get; set; }`
`69`	`76`	`}`
`70`	`77`	`}`