Merge pull request #620 from rakku-ms/az-dis-usagereporting-marketplacesyndication

[Az] Disable UsageReporting and MarketplaceSyndication for disconnected registration/Capacity billing model

Author: rakku-ms

Registration/RegisterWithAzure.psm1

@@ -346,7 +346,7 @@ function Set-AzsRegistration{
         [switch] $MarketplaceSyndicationEnabled = $true,
 
         [Parameter(Mandatory = $false, ParameterSetName = "Register")]
-        [switch] $UsageReportingEnabled = @{'Capacity'=$true; 
+        [switch] $UsageReportingEnabled = @{'Capacity'=$false; 
                                             'PayAsYouUse'=$true; 
                                             'Development'=$true; 
                                             'Custom'=$false;
@@ -416,11 +416,6 @@ function Set-AzsRegistration{
             TokenVersion                  = Get-RegistrationTokenVersion -AzureContext $AzureContext
         }
         Log-Output "Get-RegistrationToken parameters: $(ConvertTo-Json $getTokenParams)"
-        if (($BillingModel -eq 'Capacity') -and ($UsageReportingEnabled))
-        {
-            Log-Warning "Billing model is set to Capacity and Usage Reporting is enabled. This data will be used to guide product improvements and will not be used for billing purposes. If this is not desired please halt this operation and rerun with -UsageReportingEnabled:`$false. Execution will continue in 20 seconds."
-            Start-Sleep -Seconds 20        
-        }
         $registrationToken = Get-RegistrationToken @getTokenParams -Session $privilegedEndpointSession -StampInfo $stampInfo
 
         # Register environment with Azure
@@ -645,12 +640,6 @@ Function Get-AzsRegistrationToken{
         [ValidateNotNullOrEmpty()]
         [String] $TokenOutputFilePath,
 
-        [Parameter(Mandatory = $false)]
-        [Switch] $UsageReportingEnabled = $false,
-
-        [Parameter(Mandatory = $false)]
-        [Switch] $MarketplaceSyndicationEnabled = $false,
-
         [Parameter(Mandatory = $false)]
         [ValidateNotNull()]
         [string] $AgreementNumber,
@@ -666,16 +655,6 @@ Function Get-AzsRegistrationToken{
     New-RegistrationLogFile -RegistrationFunction $PSCmdlet.MyInvocation.MyCommand.Name
 
     Validate-BillingModel -BillingModel $BillingModel -MsAssetTag $MsAssetTag
-    if(($BillingModel -eq 'Capacity') -and ([String]::IsNullOrEmpty($AgreementNumber)))
-    {
-        Log-Throw -Message "Agreement number is null or empty when BillingModel is set to Capacity" -CallingFunction $PSCmdlet.MyInvocation.MyCommand.Name
-    }
-
-    if (($BillingModel -eq 'Capacity') -and ($UsageReportingEnabled))
-    {
-        Log-Warning "Billing model is set to Capacity and Usage Reporting is enabled. This data will be used to guide product improvements and will not be used for billing purposes. If this is not desired please halt this operation and rerun with -UsageReportingEnabled:`$false. Execution will continue in 20 seconds."
-        Start-Sleep -Seconds 20     
-    }
 
     if ($TokenOutputFilePath -and (-not (Test-Path -Path $TokenOutputFilePath -PathType Leaf)))
     {
@@ -697,8 +676,8 @@ Function Get-AzsRegistrationToken{
         PrivilegedEndpointCredential  = $PrivilegedEndpointCredential
         PrivilegedEndpoint            = $PrivilegedEndpoint
         BillingModel                  = $BillingModel
-        MarketplaceSyndicationEnabled = $MarketplaceSyndicationEnabled
-        UsageReportingEnabled         = $UsageReportingEnabled
+        MarketplaceSyndicationEnabled = $false
+        UsageReportingEnabled         = $false
         AgreementNumber               = $AgreementNumber
         TokenOutputFilePath           = $TokenOutputFilePath
         MsAssetTag                    = $MsAssetTag
@@ -1261,8 +1240,17 @@ Function Get-RegistrationToken{
     if( ($StampVersion -lt $CustomBillingModelVersion) -and ($BillingModel -eq 'Custom') ){
         Log-Throw -Message "Custom BillingModel is not supported for StampVersion less than $CustomBillingModelVersion" -CallingFunction $PSCmdlet.MyInvocation.MyCommand.Name
     }
+
+    if (($BillingModel -eq 'Capacity') -and ([String]::IsNullOrEmpty($AgreementNumber))) {
+        Log-Throw -Message "Agreement number is null or empty when BillingModel is set to Capacity" -CallingFunction $PSCmdlet.MyInvocation.MyCommand.Name
+    }
+
+    if (($BillingModel -eq 'Capacity') -and ($UsageReportingEnabled)) {
+        Log-Warning "Disabling Usage Reporting as it is not supported for Capacity billing model."
+        $UsageReportingEnabled = $false     
+    }
 
-        $regTokenParams = @{
+    $regTokenParams = @{
         BillingModel                    = $BillingModel
         MarketplaceSyndicationEnabled   = $MarketplaceSyndicationEnabled
         UsageReportingEnabled           = $UsageReportingEnabled
@@ -1879,7 +1867,7 @@ function Remove-RegistrationResource{
 
     $currentAttempt = 0
     $maxAttempt = 3
-    $sleepSeconds = 10 
+    $sleepSeconds = 30 
     do
     {
         try
@@ -1890,13 +1878,17 @@ function Remove-RegistrationResource{
 
             $resourceType = 'Microsoft.Azurestack/registrations'
             $lock = Get-AzResourceLock -LockName 'RegistrationResourceLock' -ResourceGroupName $ResourceGroupName -ResourceType $resourceType -ResourceName $resourceName -ErrorAction SilentlyContinue
-            if ($lock)
-            {
+            if ($lock) {
                 Write-Verbose "Removing Registration resource lock  'RegistrationResourceLock'..." -Verbose
                 Remove-AzResourceLock -LockId $lock.LockId -Force
             }
 
             Remove-AzResource -ResourceId $ResourceId -ApiVersion $azureResourceApiVersion -Force -Verbose
+            ## check if the remove registration resource is successful
+            Write-Verbose "Validating if registration resource removal succeeded." -Verbose
+            if (Get-AzResource -ResourceId $ResourceId -ApiVersion $azureResourceApiVersion -ErrorAction SilentlyContinue) {
+                throw "Removal of registration resource failed."
+            }
             break
         }
         catch