fix issue #4706 Add-AzureRmServiceFabricNodeType fails with error The…

[jagilber]

… entity name 'osDisk.name' is invalid according to its validation rule

Description

---

This checklist is used to make sure that common guidelines for a pull request are followed. You can find a more complete discussion of PowerShell cmdlet best practices here.

• I have read the contribution guidelines.
• If changes were made to any cmdlet, the XML help was regenerated using the platyPSHelp module.
• If any large changes are made to a service, they are reflected in the respective change log.

General Guidelines

• Title of the pull request is clear and informative.
• There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.
• The pull request does not introduce breaking changes (unless a major version change occurs in the assembly and module).

Testing Guidelines

• Pull request includes test coverage for the included changes.
• PowerShell scripts used in tests should do any necessary setup as part of the test or suite setup, and should not use hard-coded values for locations or existing resources.

Cmdlet Signature Guidelines

• New cmdlets that make changes or have side effects should implement ShouldProcess and have SupportShouldProcess=true specified in the cmdlet attribute. You can find more information on ShouldProcess here.
• Cmdlet specifies OutputType attribute if any output is produced - if the cmdlet produces no output, it should implement a PassThru parameter.

Cmdlet Parameter Guidelines

• Parameter types should not expose types from the management library - complex parameter types should be defined in the module.
• Complex parameter types are discouraged - a parameter type should be simple types as often as possible. If complex types are used, they should be shallow and easily creatable from a constructor or another cmdlet.
• Cmdlet parameter sets should be mutually exclusive - each parameter set must have at least one mandatory parameter not in other parameter sets.

modified: src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/AddAzureRmServiceFabricNodeType.cs

function GetStorageProfile
to detect for managed disks configuration

from:

private VirtualMachineScaleSetStorageProfile GetStorageProfile(VirtualMachineScaleSetStorageProfile existingProfile)
        {
            var vhds = CreateStorageAccount().Select(a => string.Concat(a.PrimaryEndpoints.Blob, "vhd")).ToList();
            return new VirtualMachineScaleSetStorageProfile()
            {
                ImageReference = existingProfile.ImageReference,
                OsDisk = new VirtualMachineScaleSetOSDisk()
                {
                    Caching = existingProfile.OsDisk.Caching,
                    OsType = existingProfile.OsDisk.OsType,
                    Image = existingProfile.OsDisk.Image,
                    Name = existingProfile.OsDisk.Name,
                    CreateOption = existingProfile.OsDisk.CreateOption,
                    VhdContainers = vhds
                }
            };
        }

to:

private VirtualMachineScaleSetStorageProfile GetStorageProfile(VirtualMachineScaleSetStorageProfile existingProfile)
{
	var vhds = CreateStorageAccount().Select(a => string.Concat(a.PrimaryEndpoints.Blob, "vhd")).ToList();
	var osDisk = new VirtualMachineScaleSetOSDisk()
	{
		Caching = existingProfile.OsDisk.Caching,
		OsType = existingProfile.OsDisk.OsType,
		CreateOption = existingProfile.OsDisk.CreateOption
	};
	if(existingProfile.OsDisk.ManagedDisk != null)
	{
		osDisk.ManagedDisk = existingProfile.OsDisk.ManagedDisk;
	}
	else
	{
		osDisk.Image = existingProfile.OsDisk.Image;
		osDisk.Name = existingProfile.OsDisk.Name;
		osDisk.VhdContainers = vhds;
	}
	return new VirtualMachineScaleSetStorageProfile()
	{
		ImageReference = existingProfile.ImageReference,
		OsDisk = osDisk
	};
}

testing below covers all scenarios

• tested add-azurermservicefabricnodetype against live service fabric cluster without managed disks
• tested add-azurermservicefabricnodetype against live service fabric cluster with managed disks

existing test script function Test-AddAzureRmServiceFabricNodeType detects this issue and all scenarios

test requires existing service fabric cluster in azure

../blob/preview/src/ResourceManager/ServiceFabric/Commands.ServiceFabric.Test/ScenarioTests/TestServiceFabric.ps1

function Test-AddAzureRmServiceFabricNodeType
{
	$clusterName = Get-ClusterName
	$resourceGroupName = Get-ResourceGroupName	
	$newNodeTypeName = Get-NewNodeTypeName

	$clusters = Get-AzureRmServiceFabricCluster -ClusterName $clusterName -ResourceGroupName $resourceGroupName
	$count = $clusters[0].NodeTypes.Count
    $vmPassword = ConvertTo-SecureString -Force -AsPlainText -String Get-VmPwd
	$cluster = Add-AzureRmServiceFabricNodeType -Capacity 1 -VmUserName username -VmPassword $vmPassword -NodeType $newNodeTypeName `
	           -ClusterName $clusterName -ResourceGroupName $resourceGroupName
	$clusters = Get-AzureRmServiceFabricCluster -ClusterName $clusterName -ResourceGroupName $resourceGroupName 
	Assert-AreEqual ($clusters[0].NodeTypes.Count - $count)  1
}

[azuresdkci]

Can one of the admins verify this patch?

[markcowl]

@QingChenmsft Please sign off on this change and/or designate someone who can sign off.

@jagilber Why are there no test changes to accompany this fix?

[markcowl]

Needs a covering test

[QingChenmsft]

Justin or Vaishnav will sign off this , i am not the owner any more.

[jagilber]

@markcowl updated test information

[vaishnavk]

The changes look good to me.

[markcowl]

@azuresdkci add to whitelist

[markcowl]

on demand run here: http://azuresdkci.cloudapp.net/view/1-AzurePowerShell/job/powershell-demand/1905/