Merge branch 'master' of https://github.com/Azure/AzureStack-Tools

Author: knithinc

Infrastructure/AzureStack.Infra.psm1

@@ -118,7 +118,7 @@ Export-ModuleMember -Function Get-AzsInfrastructureRoleInstance
     .SYNOPSIS
     List File Shares
 #>
-function Get-AzsStorageShare {
+function Get-AzsInfrastructureShare {
     Param(
         [Parameter(Mandatory = $false)]
         [string] $Location
@@ -130,7 +130,7 @@ function Get-AzsStorageShare {
     $shares
 }
 
-Export-ModuleMember -Function Get-AzsStorageShare
+Export-ModuleMember -Function Get-AzsInfrastructureShare
 
 <#
     .SYNOPSIS

Infrastructure/README.md

@@ -22,7 +22,7 @@ Add-AzureRMEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanage
 Then login:
 
 ```powershell
-Login-AzureRmAccount -EnvironmentName "AzureStackAdmin" 
+Login-AzureRmAccount -EnvironmentName "AzureStackAdmin"
 ```
 ----
 If you are **not** using your home directory tenant, you will need to supply the tenant ID to your login command. You may find it easiest to obtain using the Connect tool. For **Azure Active Directory** environments provide your directory tenant name:
@@ -179,7 +179,7 @@ The command does the following:
 
 ```powershell
 
-Get-AzsStorageShare
+Get-AzsInfrastructureShare
 ```
 
 The command does the following:

Infrastructure/Tests/Infra.Tests.ps1

@@ -56,8 +56,8 @@ InModuleScope $script:ModuleName {
             { Get-AzsInfraRoleInstance } |
                 Should Not Throw
         }
-        It 'Get-AzsStorageShare should not throw' {
-            { Get-AzsStorageShare } |
+        It 'Get-AzsInfrastructureShare should not throw' {
+            { Get-AzsInfrastructureShare } |
                 Should Not Throw
         }
         It 'Get-Azslogicalnetwork should not throw' {

ServiceAdmin/AzureStack.ServiceAdmin.psm1

@@ -8,35 +8,13 @@
     Creates "default" tenant offer with unlimited quotas across Compute, Network, Storage and KeyVault services.
 #>
 
-function Add-AzsStorageQuota {
+function New-AzsComputeQuota {
     param(
         [string] $Name = "default",
-        [int] $CapacityInGb = 1000,
-        [int] $NumberOfStorageAccounts = 2000,
-        [string] $Location = $null
-    )
-    
-    $Location = Get-AzsHomeLocation -Location $Location    
-
-    $params = @{
-        ResourceName = "{0}/{1}" -f $Location, $Name
-        ResourceType = "Microsoft.Storage.Admin/locations/quotas"
-        ApiVersion   = "2015-12-01-preview"
-        Properties   = @{  
-            capacityInGb            = $CapacityInGb
-            numberOfStorageAccounts = $NumberOfStorageAccounts
-        }
-    }
-
-    New-AzsServiceQuota @params
-}
-
-function Add-AzsComputeQuota {
-    param(
-        [string] $Name = "default",
-        [int] $VmCount = 1000,
-        [int] $MemoryLimitMB = 1048576,
-        [int] $CoresLimit = 1000,
+        [int] $CoresLimit = 200,
+        [int] $VirtualMachineCount = 50,
+        [int] $AvailabilitySetCount = 10,
+        [int] $VmScaleSetCount = 10,
         [string] $Location = $null
     )
 
@@ -47,16 +25,17 @@ function Add-AzsComputeQuota {
         ResourceType = "Microsoft.Compute.Admin/locations/quotas"
         ApiVersion   = "2015-12-01-preview"
         Properties   = @{
-            virtualMachineCount = $VmCount
-            memoryLimitMB       = $MemoryLimitMB
-            coresLimit          = $CoresLimit
+            virtualMachineCount  = $VirtualMachineCount
+            availabilitySetCount = $AvailabilitySetCount
+            coresLimit           = $CoresLimit
+            vmScaleSetCount      = $VmScaleSetCount
         }
     }
 
     New-AzsServiceQuota @params
 }
 
-function Add-AzsNetworkQuota {
+function New-AzsNetworkQuota {
     param(
         [string] $Name = "default",
         [int] $PublicIpsPerSubscription = 500,
@@ -145,7 +124,15 @@ function New-AzsServiceQuota {
     )
 
     $serviceQuota = New-AzureRmResource -ResourceName $ResourceName -ResourceType $ResourceType -ApiVersion $ApiVersion -Properties $Properties -Force
-    $serviceQuota.ResourceId
+    $quotaObject = New-Object PSObject      
+    foreach ($property in ($serviceQuota.Properties | Get-Member -MemberType NoteProperty)){
+        $quotaObject | Add-Member NoteProperty -Name $property.Name -Value $serviceQuota.Properties.($property.Name)
+    }
+    $quotaObject | Add-Member NoteProperty Name($serviceQuota.ResourceName)
+    $quotaObject | Add-Member NoteProperty Type($serviceQuota.ResourceType)
+    $quotaObject | Add-Member NoteProperty Location($serviceQuota.Location)
+    $quotaObject | Add-Member NoteProperty Id($serviceQuota.ResourceId)
+    $quotaObject
 }
 
 function Get-AzsServiceQuota {

ServiceAdmin/README.md

@@ -7,7 +7,7 @@ Make sure you have the following module prerequisites installed:
 ```powershell
 Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
 Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
-Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
+Install-Module -Name AzureStack -RequiredVersion 1.2.10 -Scope CurrentUser
 ```
 
 Then make sure the following modules are imported:
@@ -17,17 +17,83 @@ Import-Module ..\Connect\AzureStack.Connect.psm1
 Import-Module .\AzureStack.ServiceAdmin.psm1
 ```
 
-You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
+## Add PowerShell environment
+
+You will need to login to your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
+
+```powershell
+Add-AzureRMEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external"
+```
+
+Then login:
+
+```powershell
+Login-AzureRmAccount -EnvironmentName "AzureStackAdmin" 
+```
+----
+If you are **not** using your home directory tenant, you will need to supply the tenant ID to your login command. You may find it easiest to obtain using the Connect tool. For **Azure Active Directory** environments provide your directory tenant name:
+
+```powershell
+$TenantID = Get-AzsDirectoryTenantId -AADTenantName "<mydirectorytenant>.onmicrosoft.com" -EnvironmentName AzureStackAdmin
+```
+
+For **ADFS** environments use the following:
 
 ```powershell
-Add-AzsEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
+$TenantID = Get-AzsDirectoryTenantId -ADFS -EnvironmentName AzureStackAdmin
 ```
 
 
 ## Create default plan and quota for tenants
 
 ```powershell
-Add-AzsTenantOfferAndQuota
+# Default quotas, plan, and offer
+$PlanName = "SimplePlan"
+$OfferName = "SimpleOffer"
+$RGName = "PlansandoffersRG"
+$Location = (Get-AzsLocation).Name
+
+$computeParams = @{
+Name = "computedefault"
+CoresLimit = 200
+AvailabilitySetCount = 10
+VirtualMachineCount = 50
+VmScaleSetCount = 10
+Location = $Location
+}
+
+$netParams = @{
+Name = "netdefault"
+PublicIpsPerSubscription = 500
+VNetsPerSubscription = 500
+GatewaysPerSubscription = 10
+ConnectionsPerSubscription = 20
+LoadBalancersPerSubscription = 500
+NicsPerSubscription = 1000
+SecurityGroupsPerSubscription = 500
+Location = $Location
+}
+
+$storageParams = @{
+Name = "storagedefault"
+NumberOfStorageAccounts = 20
+CapacityInGB = 2048
+Location = $Location
+}
+
+$kvParams = @{
+Location = $Location
+}
+
+$quotaIDs = @()
+$quotaIDs += (New-AzsNetworkQuota @netParams).ID
+$quotaIDs += (New-AzsComputeQuota @computeParams).ID
+$quotaIDs += (New-AzsStorageQuota @storageParams).ID
+$quotaIDs += (Get-AzsKeyVaultQuota @kvParams)
+
+New-AzureRmResourceGroup -Name $RGName -Location $Location
+$plan = New-AzsPlan -Name $PlanName -DisplayName $PlanName -ArmLocation $Location -ResourceGroupName $RGName -QuotaIds $QuotaIDs
+New-AzsOffer -Name $OfferName -DisplayName $OfferName -State Public -BasePlanIds $plan.Id -ResourceGroupName $RGName -ArmLocation $Location 
 ```
 
-Tenants can now see the "default" offer available to them and can subscribe to it. The offer includes unlimited compute, network, storage and key vault usage.
+Tenants can now see the "SimpleOffer" offer available to them and can subscribe to it. The offer includes unlimited compute, network, storage and key vault usage.