Update Tutorial

Author: ffeldhaus

StorageGRID-Webscale-Tutorial.md

@@ -35,39 +35,39 @@ For data retrieval a connection to the StorageGRID Management Server is required
 ```powershell
 $Server = "nms.mydomain.tld"
 $Credential = Get-Credential
-Connect-S3MgmtServer -Name $ServerName -Credential $Credential
+Connect-SGWServer -Name $Server -Credential $Credential
 ```
 
 If the login fails, it is often due to an untrusted certificate of the StorageGRID Management Server. You can ignore the certificate check with the `-Insecure` option
 
 ```powershell
-Connect-S3MgmtServer -Name $ServerName -Credential $Credential -Insecure
+Connect-SGWServer -Name $Server -Credential $Credential -Insecure
 ```
 
-By default the connection to the S3Mgmt server is established through HTTPS. If that doesn't work, HTTP will be tried. 
+By default the connection to the StorageGRID Webscale Server is established through HTTPS. If that doesn't work, HTTP will be tried. 
 
 To force connections via HTTPS use the `-HTTPS` switch
 
 ```powershell
-Connect-S3MgmtServer -Name $ServerName -Credential $Credential -HTTPS
+Connect-SGWServer -Name $Server -Credential $Credential -HTTPS
 ```
 
 To force connections via HTTP use the `-HTTP` switch
 
 ```powershell
-Connect-S3MgmtServer -Name $ServerName -Credential $Credential -HTTP
+Connect-SGWServer -Name $Server -Credential $Credential -HTTP
 ```
 
 ## Simple workflow for exporting S3 account usage to CSV
 
 In this simple workflow the S3 account usage data will be retrieved and exported as CSV to [C:\tmp\usage.csv](C:\tmp\usage.csv).
 
 ```powershell
-$Accounting = foreach ($Account in Get-S3Accounts) {
-    $Usage = Get-S3AccountUsage -id $Account.id
+$Accounting = foreach ($Account in (Get-SGWAccounts | Where-Object { $_.capabilities -match "s3" })) {
+    $Usage = $Account | Get-SGWAccountUsage
     $Output = New-Object -TypeName PSCustomObject -Property @{Name=$Account.name;ID=$Account.id;"Calculation Time"=$Usage.calculationTime;"Object Count"=$Usage.objectCount;"Data Bytes used"=$Usage.dataBytes}
     Write-Output $Output
-} 
+}
 
 $Accounting | Export-Csv -Path C:\tmp\usage.csv -NoTypeInformation
 ```

src/StorageGRID-Webscale.psm1

@@ -27,16 +27,19 @@ function global:Connect-SGWServer {
         [parameter(Mandatory=$True,
                    Position=1,
                    HelpMessage="A System.Management.Automation.PSCredential object containing the credentials needed to log into the StorageGRID Webscale Management Server.")][System.Management.Automation.PSCredential]$Credential,
-        [parameter(Mandatory=$False,
+        [parameter(Mandatory=$True,
                    Position=2,
+                   HelpMessage="Account ID for Tenenant Login")][System.Management.Automation.PSCredential]$AccountID,
+        [parameter(Mandatory=$False,
+                   Position=3,
                    HelpMessage="This cmdlet always tries to establish a secure HTTPS connection to the StorageGRID Webscale Management Server, but it will fall back to HTTP if necessary. Specify -HTTP to skip the HTTPS connection attempt and only try HTTP.")][Switch]$HTTP,
         [parameter(Mandatory=$False,
-                   Position=2,
+                   Position=4,
                    HelpMessage="This cmdlet always tries to establish a secure HTTPS connection to the StorageGRID Webscale Management Server, but it will fall back to HTTP if necessary. Specify -HTTPS to fail the connection attempt in that case rather than fall back to HTTP.")][Switch]$HTTPS,
         [parameter(Mandatory=$False,
-                   Position=3,
+                   Position=5,
                    HelpMessage="If the StorageGRID Webscale Management Server certificate cannot be verified, the connection will fail. Specify -Insecure to ignore the validity of the StorageGRID Webscale Management Server certificate.")][Switch]$Insecure,
-        [parameter(Position=4,
+        [parameter(Position=6,
                    Mandatory=$False,
                    HelpMessage="Specify -Transient to not set the global variable `$CurrentOciServer.")][Switch]$Transient
     )
@@ -60,12 +63,23 @@ function global:Connect-SGWServer {
     $Server | Add-Member -MemberType NoteProperty -Name Name -Value $Name
     $Server | Add-Member -MemberType NoteProperty -Name Credential -Value $Credential
 
-    $Body = @"
+    if ($AccountID) {
+        $Body = @"
 {
+    "accountId": "$AccountID",
     "username": "$($Credential.UserName)", 
     "password": "$($Credential.GetNetworkCredential().Password)"
 }
 "@
+    }
+    else {
+        $Body = @"
+{
+    "username": "$($Credential.UserName)", 
+    "password": "$($Credential.GetNetworkCredential().Password)"
+}
+"@
+    }
 
     if ($HTTPS -or !$HTTP) {
         Try {