Merge branch 'main' into add_ubuntu_support

Author: shmueldanan

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/createClone.py

@@ -127,7 +127,7 @@ def usage():
     sys.exit(2)
 #
 # Check that all the required parameters are present.
-if secretArn == "" or secretKey == "" or linkArn == "" or fsxId == "" or svmName == "" or parentVolumeName == "" or cloneVolumeName == "":
+if secretArn == "" or secretKey == "" or linkArn == "" or fsxId == "" or svmName == "" or parentVolumeName == "" or cloneVolumeName == "" or region == "":
     print("Missing required parameters.")
     usage()
     sys.exit(1)

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_SM_relationship

@@ -39,7 +39,7 @@ destinationAggregate="aggr1"
 template=""
 #
 # Get the default region from the AWS CLI configuration
-region=$(aws configure list | awk '/region/{print $2}')
+region=$(aws configure get region)
 #
 # Parse the command line arguments
 while [ ! -z "$1" ]; do

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_clone

@@ -27,7 +27,7 @@ parentVolumeName=""
 cloneVolumeName=""
 template=""
 
-region=$(aws configure list | awk '/region/{print $2}')
+region=$(aws configure get region)
 
 while getopts "hr:l:s:k:f:v:p:c:t:" opt; do
   case $opt in

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_export_policy

@@ -30,7 +30,7 @@ protocols="any"
 matchCidr="0.0.0.0/0"
 template=""
 
-region=$(aws configure list | awk '/region/{print $2}')
+region=$(aws configure get region)
 
 while getopts "hr:l:s:k:f:v:n:p:c:t:" opt; do
   case $opt in

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_snapshot

@@ -27,7 +27,7 @@ volumeName=""
 snapshotName=""
 template=""
 
-region=$(aws configure list | awk '/region/{print $2}')
+region=$(aws configure get region)
 
 while getopts "hr:l:s:k:f:v:n:p:t:" opt; do
   case $opt in

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_volume

@@ -29,7 +29,7 @@ svmName=""
 size="$((20*1024*1024))"
 aggregates="aggr1"
 
-region=$(aws configure list | awk '/region/{print $2}')
+region=$(aws configure get region)
 
 while getopts "hr:l:s:k:f:v:n:z:a:t:" opt; do
   case $opt in

Management-Utilities/Workload-Factory-API-Samples/README.md

@@ -42,8 +42,10 @@ If you do create a new script, please consider contributing it back to this repo
 | [bluexp_fsxn_discovery](bluexp_fsxn_discovery) | This discovers FSx for ONTAP file systems for the giving bluexp account and workspace. |
 | [bluexp_organization_add](bluexp_organization_add) | This adds a new BlueXP organization (a.k.a. account). |
 | [bluexp_organization_delete](bluexp_organization_delete) | This deletes a BlueXP organization (a.k.a. account). |
+| [bluexp_organization_rename](bluexp_organization_rename) | This renames a BlueXP organization (a.k.a. account). |
 | [credentials_delete](credentials_delete) | This deletes a Workload Factory credential. |
 | [fsxn_credentials_set](fsxn_credentials_set) | This sets the credentials for a specified FSx for ONTAP file system. |
+| [get_latency_details](get_latency_details) | Get the specific details of a latency event. |
 | [link_associate](link_associate) | This associates a Workload Factory Link with a specified FSx for ONTAP file system. |
 | [link_delete](link_delete) | This deletes a Workload Factory Link. |
 | [link_disassociate](link_disassociate) | This disassociates a Workload Factory Link with a specified FSx for ONTAP file system. |
@@ -54,10 +56,12 @@ If you do create a new script, please consider contributing it back to this repo
 | [list_bluexp_workspaces](list_bluexp_workspaces) | This list all the BlueXP workspaces that you have access to. |
 | [list_credentials](list_credentials) | This lists all the Workload Factory credentials that you have access to. |
 | [list_filesystems](list_filesystems) | This lists all the FSx for ONTAP file systems that you have access to in the specified AWS region. |
+| [list_latency_events](list_latency_events) | This lists all the latnecy events associated with the BlueXP account. |
 | [list_links](list_links) | This lists all the Workload Factory Links that you have access to. |
 | [list_snapmirrors](list_snapmirrors) | This lists all the SnapMirror relationships that are associated with the specified file system. |
 | [list_svms](list_svms) | This lists all the SVMs that are associated with the specified file system. |
 | [list_volumes](list_volumes) | This lists all the volumes that are associated with the specified file system. |
+| [list_volume_cifs_shares](list_volume_cifs_shares) | This lists cifs shares associated with a volume in the specified file system. |
 | [show_fsxn_credentials](show_fsxn_credentials) | This shows the credentials that Workload Factory has stored for the specified FSx for ONTAP file system. |
 | [snapmirror_break](snapmirror_break) | This breaks the SnapMirror relationship for the specified relationship. |
 | [snapmirror_create](snapmirror_create) | This creates a SnapMirror relationship between the specified source volume and destination SVM. |
@@ -67,6 +71,8 @@ If you do create a new script, please consider contributing it back to this repo
 | [snapmirror_update](snapmirror_update) | This updates the SnapMirror relationship for the specified relationship. |
 | [snapshot_create](snapshot_create) | This creates a snapshot of the specified volume. |
 | [volume_clone](volume_clone) | This clones the specified volume. |
+| [volume_cifs_share_create](volume_cifs_share_create) | This will create a CIFS share in a volume. |
+| [volume_cifs_share_delete](volume_cifs_share_delete) | This will delete a CIFS share from a volume. |
 | [volume_delete](volume_delete) | This deletes the specified volume. |
 | [wf_utils](wf_utils) | This file contains common functions used by all the scripts. It includes the `get_token()` function that retrieves an access token from the Workload Factory API. |
 

Management-Utilities/Workload-Factory-API-Samples/bluexp_fsxn_discovery

@@ -6,7 +6,7 @@
 # The username field is optional and defaults to fsxadmin if not present.
 #
 ################################################################################
-# Display usage information then exists the script.
+# Display usage information then exits the script.
 ################################################################################
 usage () {
   cat 1>&2 <<EOF
@@ -100,7 +100,7 @@ required_options["REFRESH_TOKEN"]='Error: A BlueXP refresh token is required to
 required_options["BLUEXP_ACCOUNT_ID"]='Error: A BlueXP account ID is required to run this script.
 You can get the list of accounts you have access to by running the "list_bluexp_accts" script
 found in this GitHub repository: https://github.com/NetApp/FSx-ONTAP-samples-scripts/tree/main/Management-Utilities/Workload-Factory-API-Samples\n\n'
-required_options["CREDENTIALS_ID"]='Error: The ID of the credentials to delete is required.
+required_options["CREDENTIALS_ID"]='Error: The Workload Factory credentials ID used to list resources is required to run this script.
 You can get a list of credentials by running the "list_credentials" script
 found in this GitHub repository: https://github.com/NetApp/FSx-ONTAP-samples-scripts/tree/main/Management-Utilities/Workload-Factory-API-Samples\n\n'
 required_options["AWS_REGION"]='Error: The AWS region where the file system is located is required.\n\n'

Management-Utilities/Workload-Factory-API-Samples/bluexp_organization_add

@@ -3,7 +3,7 @@
 # This script adds an organization to a BlueXP account.
 #
 ################################################################################
-# Display usage information then exists the script.
+# Display usage information then exits the script.
 ################################################################################
 usage () {
   cat 1>&2 <<EOF

Management-Utilities/Workload-Factory-API-Samples/bluexp_organization_delete

@@ -3,7 +3,7 @@
 # This script deletes an organization from a BlueXP account.
 #
 ################################################################################
-# Display usage information then exists the script.
+# Display usage information then exits the script.
 ################################################################################
 usage () {
   cat 1>&2 <<EOF
@@ -79,7 +79,6 @@ if [ -z "$token" ]; then
   exit 1
 fi
 #
-# Add the organization to the BlueXP workspace.
 echo -n "Deleting organization ${ORGANIZATION_ID}..."
 run_curl "DELETE" "$token" "https://api.bluexp.netapp.com/v1/management/organizations/$ORGANIZATION_ID" $tmpout $tmperr
 echo "Done."