fix bug if virtualNetwork is in a different resource group fixes #8407

Azure · Jul 19, 2019 · bd614ba · bd614ba
1 parent 07f13b3
commit bd614ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ServiceFabric/ServiceFabric/ChangeLog.md b/src/ServiceFabric/ServiceFabric/ChangeLog.md
@@ -18,7 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Fix add node type NullReferenceException bug when resource group had other vmss not related to the service fabric cluster. Fixes issue: https://github.com/Azure/azure-powershell/issues/8681
+* Fix add node type cmdlet bugs
+    -NullReferenceException bug when resource group had other vmss not related to the service fabric cluster. Fixes issue: https://github.com/Azure/azure-powershell/issues/8681
+    - Fix bug where cmdlet failed if virtualNetwork was in a different resource group that the cluser. fixes issue: https://github.com/Azure/azure-powershell/issues/8407
 
 ## Version 1.1.1
 * Fix add certificate ByExistingKeyVault getting the wrong thumbprint in some cases

diff --git a/src/ServiceFabric/ServiceFabric/Commands/AddAzureRmServiceFabricNodeType.cs b/src/ServiceFabric/ServiceFabric/Commands/AddAzureRmServiceFabricNodeType.cs
@@ -623,18 +623,20 @@ private string GetSubnetAddressPrefix(VirtualMachineScaleSetIPConfiguration ipCo
             var subnetId = ipConfiguration.Subnet.Id;
             var segments = subnetId.Split('/');
             if (!segments[segments.Length - 2].Equals("subnets", StringComparison.OrdinalIgnoreCase) || 
-                !segments[segments.Length - 4].Equals("virtualNetworks", StringComparison.OrdinalIgnoreCase))
+                !segments[segments.Length - 4].Equals("virtualNetworks", StringComparison.OrdinalIgnoreCase) ||
+                !segments[segments.Length - 8].Equals("resourceGroups", StringComparison.OrdinalIgnoreCase))
             {
                 throw new InvalidOperationException(
                     string.Format(
                         ServiceFabricProperties.Resources.InvalidNetworkNameInResourceId, 
                         subnetId));
             }
 
+            var subNetRG = segments[segments.Length - 7];
             var subnetName = segments[segments.Length - 1];
             var virtualNetworkName = segments[segments.Length - 3];
 
-            var subnet = NetworkManagementClient.Subnets.Get(this.ResourceGroupName, virtualNetworkName, subnetName);
+            var subnet = NetworkManagementClient.Subnets.Get(subNetRG, virtualNetworkName, subnetName);
             return subnet.AddressPrefix;
         }
     }