Address Copilot review comments: null-safe RoutingConfigurationText, mutual exclusion validation, bounded polling loops

Author: iramtirth

src/Network/Network.Management.Sdk/Generated/Models/BgpConnection.cs

@@ -122,6 +122,13 @@ public BgpConnection()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "properties.connectionState")]
         public string ConnectionState {get; private set; }
+
+        /// <summary>
+        /// Gets or sets the routing configuration indicating the associated and
+        /// propagated route tables for this connection.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "properties.routingConfiguration")]
+        public RoutingConfiguration RoutingConfiguration {get; set; }
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Network/Network.Management.Sdk/Generated/Models/BgpConnectionProperties.cs

@@ -86,6 +86,13 @@ public BgpConnectionProperties()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "connectionState")]
         public string ConnectionState {get; private set; }
+
+        /// <summary>
+        /// Gets or sets the routing configuration indicating the associated and
+        /// propagated route tables for this connection.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "routingConfiguration")]
+        public RoutingConfiguration RoutingConfiguration {get; set; }
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Network/Network.Management.Sdk/Generated/Models/VirtualNetworkGatewayConnection.cs

@@ -374,6 +374,13 @@ public VirtualNetworkGatewayConnection()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "properties.authenticationType")]
         public string AuthenticationType {get; set; }
+
+        /// <summary>
+        /// Gets or sets the routing configuration indicating the associated and
+        /// propagated route tables for this connection.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "properties.routingConfiguration")]
+        public RoutingConfiguration RoutingConfiguration {get; set; }
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Network/Network.Management.Sdk/Generated/Models/VirtualNetworkGatewayConnectionListEntity.cs

@@ -308,6 +308,13 @@ public VirtualNetworkGatewayConnectionListEntity()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "properties.enablePrivateLinkFastPath")]
         public bool? EnablePrivateLinkFastPath {get; set; }
+
+        /// <summary>
+        /// Gets or sets the routing configuration indicating the associated and
+        /// propagated route tables for this connection.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "properties.routingConfiguration")]
+        public RoutingConfiguration RoutingConfiguration {get; set; }
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Network/Network.Management.Sdk/Generated/Models/VirtualNetworkGatewayConnectionListEntityPropertiesFormat.cs

@@ -280,6 +280,13 @@ public VirtualNetworkGatewayConnectionListEntityPropertiesFormat()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "enablePrivateLinkFastPath")]
         public bool? EnablePrivateLinkFastPath {get; set; }
+
+        /// <summary>
+        /// Gets or sets the routing configuration indicating the associated and
+        /// propagated route tables for this connection.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "routingConfiguration")]
+        public RoutingConfiguration RoutingConfiguration {get; set; }
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Network/Network.Management.Sdk/Generated/Models/VirtualNetworkGatewayConnectionPropertiesFormat.cs

@@ -346,6 +346,13 @@ public VirtualNetworkGatewayConnectionPropertiesFormat()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "certificateAuthentication")]
         public CertificateAuthentication CertificateAuthentication {get; set; }
+
+        /// <summary>
+        /// Gets or sets the routing configuration indicating the associated and
+        /// propagated route tables for this connection.
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "routingConfiguration")]
+        public RoutingConfiguration RoutingConfiguration {get; set; }
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Network/Network.Test/ScenarioTests/RouteServerTests.ps1

@@ -246,12 +246,16 @@ function Test-RouteServerPeerWithRoutingConfiguration
         # Get the route server hub and wait for provisioning
         $virtualHubName = $routeServerName
         $virtualHub = Get-AzVirtualHub -ResourceGroupName $rgname -Name $virtualHubName
-        while ($virtualHub.RoutingState -eq "Provisioning")
+        $routingStatePollIntervalSeconds = 180
+        $maxRoutingStatePollAttempts = 10
+        $routingStatePollAttempt = 0
+        while ($virtualHub.RoutingState -eq "Provisioning" -and $routingStatePollAttempt -lt $maxRoutingStatePollAttempts)
         {
-            Start-TestSleep -Seconds 180
+            Start-TestSleep -Seconds $routingStatePollIntervalSeconds
             $virtualHub = Get-AzVirtualHub -ResourceGroupName $rgname -Name $virtualHubName
+            $routingStatePollAttempt++
         }
-        Assert-AreEqual $virtualHub.RoutingState "Provisioned"
+        Assert-AreEqual "Provisioned" $virtualHub.RoutingState
 
         # Create a route map on the route server hub
         $routeMapMatchCriterion1 = New-AzRouteMapRuleCriterion -MatchCondition "Contains" -RoutePrefix @("10.0.0.0/16")

src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.ps1

@@ -1145,12 +1145,16 @@ function Test-VirtualNetworkGatewayConnectionWithRoutingConfiguration
         Assert-NotNull $virtualHub
 
         # Wait for Virtual Hub Routing State to become Provisioned
-        while ($virtualHub.RoutingState -eq "Provisioning")
+        $routingStatePollIntervalSeconds = 180
+        $maxRoutingStatePollAttempts = 10
+        $routingStatePollAttempt = 0
+        while ($virtualHub.RoutingState -eq "Provisioning" -and $routingStatePollAttempt -lt $maxRoutingStatePollAttempts)
         {
-            Start-TestSleep -Seconds 180
+            Start-TestSleep -Seconds $routingStatePollIntervalSeconds
             $virtualHub = Get-AzVirtualHub -ResourceGroupName $rgname -Name $virtualHubName
+            $routingStatePollAttempt++
         }
-        Assert-AreEqual $virtualHub.RoutingState "Provisioned"
+        Assert-AreEqual "Provisioned" $virtualHub.RoutingState
 
         # Create a route map on the route server hub
         $routeMapMatchCriterion1 = New-AzRouteMapRuleCriterion -MatchCondition "Contains" -RoutePrefix @("10.0.0.0/16")

src/Network/Network/Generated/Models/PSBgpConnection.cs

@@ -38,7 +38,7 @@ public partial class PSBgpConnection : PSChildResource
         [JsonIgnore]
         public string RoutingConfigurationText
         {
-            get { return JsonConvert.SerializeObject(RoutingConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+            get { return RoutingConfiguration == null ? string.Empty : JsonConvert.SerializeObject(RoutingConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
     }
 } 

src/Network/Network/Generated/Models/PSRouteServerPeer.cs

@@ -21,7 +21,7 @@ public partial class PSRouteServerPeer : PSChildResource
         [JsonIgnore]
         public string RoutingConfigurationText
         {
-            get { return JsonConvert.SerializeObject(RoutingConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+            get { return RoutingConfiguration == null ? string.Empty : JsonConvert.SerializeObject(RoutingConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
     }
 }