Fixing ports for local testing. (microsoftgraph#73)

satyakonmsft · May 30, 2019 · e96e373 · e96e373
1 parent a396591
commit e96e373
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/ServiceConfiguration.Cloud.cscfg b/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/ServiceConfiguration.Cloud.cscfg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceConfiguration serviceName="AudioVideoPlaybackBot" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="6" osVersion="*" schemaVersion="2015-04.2.6">
   <Role name="WorkerRole">
-    <Instances count="1" />
+    <Instances count="2" />
     <ConfigurationSettings> 
       <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="DefaultEndpointsProtocol=https;AccountName=$storage$;AccountKey=$storageKey$" />
       <Setting name="ServiceDnsName" value="%ServiceDns%" /> 

diff --git a/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/ServiceDefinition.csdef b/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/ServiceDefinition.csdef
@@ -29,7 +29,7 @@
       <Setting name="APPINSIGHTS_INSTRUMENTATIONKEY" />
     </ConfigurationSettings>
     <Endpoints>
-      <InputEndpoint name="DefaultEndpoint" protocol="tcp" port="443" localPort="9443" />
+      <InputEndpoint name="DefaultEndpoint" protocol="tcp" port="443" localPort="9441" />
       <InstanceInputEndpoint name="InstanceCallControlEndpoint" protocol="tcp" localPort="10100">
         <AllocatePublicPortFrom>
           <FixedPortRange max="10199" min="10100" />

diff --git a/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/WorkerRole/AzureConfiguration.cs b/Samples/V1.0Samples/LocalMediaSamples/AudioVideoPlaybackBot/WorkerRole/AzureConfiguration.cs
@@ -121,11 +121,11 @@ internal class AzureConfiguration : IConfiguration
         private const string InstanceIdToken = "in_";
 
         /// <summary>
-        /// localPort specified in <InputEndpoint name="DefaultCallControlEndpoint" protocol="tcp" port="443" localPort="9443" />
+        /// localPort specified in <InputEndpoint name="DefaultCallControlEndpoint" protocol="tcp" port="443" localPort="9441" />
         /// in .csdef. This is needed for running in emulator. Currently only messaging can be debugged in the emulator.
         /// Media debugging in emulator will be supported in future releases.
         /// </summary>
-        private const int DefaultPort = 9443;
+        private const int DefaultPort = 9441;
 
         /// <summary>
         /// Graph logger.
@@ -287,7 +287,7 @@ public void Initialize()
                     HttpRouteConstants.CallSignalingRoutePrefix));
 
                 controlListenUris.Add(new Uri("https://" + defaultEndpoint.IPEndpoint.Address + ":" + DefaultPort + "/"));
-                controlListenUris.Add(new Uri("http://" + defaultEndpoint.IPEndpoint.Address + ":" + (DefaultPort - 1) + "/"));
+                controlListenUris.Add(new Uri("http://" + defaultEndpoint.IPEndpoint.Address + ":" + (DefaultPort + 1) + "/"));
             }
             else
             {

diff --git a/...es/V1.0Samples/LocalMediaSamples/HueBot/HueBot/ARM_Deployment/AzureDeploy.Parameters.json b/...es/V1.0Samples/LocalMediaSamples/HueBot/HueBot/ARM_Deployment/AzureDeploy.Parameters.json
@@ -30,7 +30,7 @@
       "value": 80
     },
     "loadBalancedAppPort2": {
-      "value": 9443
+      "value": 9441
     },
     "clusterProtectionLevel": {
       "value": "EncryptAndSign"

diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/PackageRoot/ServiceManifest.xml b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/PackageRoot/ServiceManifest.xml
@@ -36,7 +36,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
           listen. Please note that if your service is partitioned, this port is shared with 
           replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="ServiceEndpoint" Type="Input" Protocol="https" Port="9443" />
+      <Endpoint Name="ServiceEndpoint" Type="Input" Protocol="https" Port="9441" />
 
       <!-- Instance input port for Signaling; traffic to this is enabled by the NAT pool in Load Balancer settings. -->
       <Endpoint Name="SignalingPort" Type="Input" Protocol="https" Port="9444" />

diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/README.md b/Samples/V1.0Samples/LocalMediaSamples/HueBot/README.md
@@ -124,12 +124,12 @@ Click `Start` on the top toolbar to deploy the sample to the local cluster.
 
 1. Join the meeting from the Teams client and start up video.
 
-1. Interact with your service, _adjusting the service URL appropriately_. Target port 9443 for the first request to the load balancer. The returned URL will be on a different port/node that picked up the call.
+1. Interact with your service, _adjusting the service URL appropriately_. Target port 9441 for the first request to the load balancer. The returned URL will be on a different port/node that picked up the call.
     1. Use Postman to post the following `JSON` payload.
 
         ##### Request
         ```json
-            POST https://huebotsxxxxx.xxxx.cloudapp.azure.com:9443/joinCall
+            POST https://huebotsxxxxx.xxxx.cloudapp.azure.com:9441/joinCall
             Content-Type: application/json
 
             {