Merge pull request #31 from NetApp/release-v2.6.0

Release v2.6.0

Author: mboglesby

README.md

@@ -1,20 +1,20 @@
 NetApp DataOps Toolkit
 =========
 
-The NetApp DataOps Toolkit is a Python-based tool that simplifies the management of development/training workspaces and inference servers that are backed by high-performance, scale-out NetApp storage. Key capabilities include:
-- Rapidly provision new high-capacity JupyterLab workspaces that are backed by high-performance, scale-out NetApp storage.
-- Rapidly provision new NVIDIA Triton Inference Server instances that are backed by enterprise-class NetApp storage.
-- Near-instantaneously clone high-capacity JupyterLab workspaces in order to enable experimentation or rapid iteration.
-- Near-instantaneously save snapshots of high-capacity JupyterLab workspaces for backup and/or traceability/baselining.
-- Near-instantaneously provision, clone, and snapshot high-capacity, high-performance data volumes.
+The NetApp DataOps Toolkit is a collection of Python-based client tools that simplify the management of data volumes and data science/engineering workspaces that are backed by high-performance, scale-out NetApp storage. Key capabilities include:
+- Rapidly provision new data volumes (file shares) or JupyterLab workspaces that are backed by high-performance, scale-out NetApp storage.
+- Near-instantaneously clone data volumes (file shares) or JupyterLab workspaces in order to enable experimentation or rapid iteration.
+- Near-instantaneously save snapshots of data volumes (file shares) or JupyterLab workspaces for backup and/or traceability/baselining.
+- Replicate data volumes (file shares) across different environments.
 
-## Getting Started
+The toolkit includes [MCP Servers](mcp_servers.md) that expose many of these capabilities as "tools" that can be utilized by AI agents.
 
-The latest stable release of the NetApp DataOps Toolkit is version 2.5.0. It is recommended to always use the latest stable release. You can access the documentation for the latest stable release [here](https://github.com/NetApp/netapp-dataops-toolkit/tree/v2.5.0)
+## Getting Started
 
-The NetApp DataOps Toolkit comes in two different flavors. For access to the most capabilities, we recommend using the [NetApp DataOps Toolkit for Kubernetes](netapp_dataops_k8s/). This flavor supports the full functionality of the toolkit, including JupyterLab workspace and NVIDIA Triton Inference Server management capabilities, but requires access to a Kubernetes cluster. 
+The NetApp DataOps Toolkit includes the following client tools:
 
-If you do not have access to a Kubernetes cluster, then you can use the [NetApp DataOps Toolkit for Traditional Environments](netapp_dataops_traditional/). However, this flavor only supports data volume management capabilities. It does not support the JupyterLab workspace and NVIDIA Triton Inference Server management capabilities that are available with the NetApp DataOps Toolkit for Kubernetes.
+- The [NetApp DataOps Toolkit for Kubernetes](netapp_dataops_k8s/) includes data volume management, JupyterLab management, and data movement capabilities for users that have access to a Kubernetes cluster. 
+- The [NetApp DataOps Toolkit for Traditional Environments](netapp_dataops_traditional/) includes basic data volume management capabilities. It will run on most Linux and macOS clients, and does not require Kubernetes.
 
 ## Support
 

mcp_servers.md

@@ -0,0 +1,42 @@
+# MCP Servers Included in the NetApp DataOps Toolkit
+
+The NetApp DataOps Toolkit includes multiple MCP Servers. These MCP Servers expose DataOps Toolkit capabilities as "tools" that can be utilized by AI agents.
+
+## NetApp DataOps Toolkit MCP Server for ONTAP
+
+The [NetApp DataOps Toolkit MCP Server for ONTAP](netapp_dataops_traditional/docs/mcp_server.md) is an MCP Server that enables AI agents to manage volumes and snapshots on an ONTAP system, including NetApp AFF and FAS appliances, Amazon FSx for NetApp ONTAP instances, and NetApp Cloud Volumes ONTAP instances.
+
+### Available Tools
+
+- **Create Volume**: Rapidly provision new data volumes with customizable configurations.
+- **Clone Volume**: Create near-instantaneous, space-efficient clones of existing volumes using NetApp FlexClone technology.
+- **List Volumes**: Retrieve a list of all existing data volumes, with optional space usage details.
+- **Mount Volume**: Mount existing data volumes locally as read-only or read-write.
+- **Create Snapshot**: Create space-efficient, read-only copies of data volumes for versioning and traceability.
+- **List Snapshots**: Retrieve a list of all snapshots for a specific volume.
+- **Create SnapMirror Relationship**: Set up SnapMirror relationships for efficient data replication.
+- **List SnapMirror Relationships**: Retrieve a list of all SnapMirror relationships on the storage system.
+
+## NetApp DataOps Toolkit for Kubernetes MCP Server
+
+The [NetApp DataOps Toolkit for Kubernetes MCP Server](netapp_dataops_k8s/docs/mcp_server_k8s.md) is an MCP Server that enables AI agents to manage persistent volumes, volume snapshots, and JupyterLab workspaces within a Kubernetes cluster. This MCP server relies on the NetApp Trident CSI driver and is compatible with NetApp AFF and FAS appliances, Amazon FSx for NetApp ONTAP, Azure NetApp Files, Google Cloud NetApp Volumes, and NetApp Cloud Volumes ONTAP.
+
+### Available Tools
+
+This MCP Server provides the following tools for managing JupyterLab workspaces and volumes in a Kubernetes environment:
+
+#### Workspace Management Tools
+
+- **CreateJupyterLab**: Create a new JupyterLab workspace.
+- **CloneJupyterLab**: Clone an existing JupyterLab workspace.
+- **ListJupyterLabs**: List all JupyterLab workspaces.
+- **CreateJupyterLabSnapshot**: Create a snapshot of a JupyterLab workspace.
+- **ListJupyterLabSnapshots**: List all snapshots of JupyterLab workspaces.
+
+#### Volume Management Tools
+
+- **CreateVolume**: Create a new volume.
+- **CloneVolume**: Clone an existing volume.
+- **ListVolumes**: List all volumes.
+- **CreateVolumeSnapshot**: Create a snapshot of a volume.
+- **ListVolumeSnapshots**: List all snapshots of volumes.

netapp_dataops_k8s/README.md

@@ -1,7 +1,7 @@
 NetApp DataOps Toolkit for Kubernetes
 =========
 
-The NetApp DataOps Toolkit for Kubernetes is a Python library that makes it simple for developers, data scientists, DevOps engineers, and data engineers to perform various data management tasks within a Kubernetes cluster. Some of the key capabilities that the toolkit provides are the ability to provision a new persistent volume or data science workspace, the ability to almost instantaneously clone a volume or workspace, the ability to almost instantaneously save off a snapshot of a volume or workspace for traceability/baselining, and the ability to move data between S3 compatible object storage and a Kubernetes persistent volume.
+The NetApp DataOps Toolkit for Kubernetes is a Python library that makes it simple for developers, data scientists, DevOps engineers, and data engineers to perform various data management tasks within a Kubernetes cluster. Some of the key capabilities that the toolkit provides are the ability to provision a new persistent volume or data science workspace, the ability to almost instantaneously clone a volume or workspace, the ability to almost instantaneously save off a snapshot of a volume or workspace for traceability/baselining, and the ability to move data between S3 compatible object storage and a Kubernetes persistent volume. The toolkit also includes an [MCP Server](docs/mcp_server_k8s.md) that exposes many of the capabilities as "tools" that can be utilized by AI agents.
 
 ## Compatibility
 
@@ -15,16 +15,17 @@ The toolkit is currently compatible with Trident versions 20.07 and above. Addit
 
 - ontap-nas
 - ontap-nas-flexgroup
-- gcp-cvs
 - azure-netapp-files
+- google-cloud-netapp-volume
+- gcp-cvs
 
 The toolkit is currently compatible with all versions of the BeeGFS CSI driver, though not all functionality is supported by BeeGFS. Operations that are not supported by BeeGFS are noted within the documentation.
 
 ## Installation
 
 ### Prerequisites
 
-The NetApp DataOps Toolkit for Kubernetes requires that Python 3.8, 3.9, 3.10, or 3.11 be installed on the local host. Additionally, the toolkit requires that pip for Python3 be installed on the local host. For more details regarding pip, including installation instructions, refer to the [pip documentation](https://pip.pypa.io/en/stable/installing/).
+The NetApp DataOps Toolkit for Kubernetes requires that Python 3.8, 3.9, 3.10, 3,11, 3.12, or 3.13 be installed on the local host. Additionally, the toolkit requires that pip for Python3 be installed on the local host. For more details regarding pip, including installation instructions, refer to the [pip documentation](https://pip.pypa.io/en/stable/installing/).
 
 ### Installation Instructions
 
@@ -38,9 +39,9 @@ python3 -m pip install netapp-dataops-k8s
 
 ## Getting Started: Standard Usage
 
-The NetApp DataOps Toolkit for Kubernetes can be utilized from any Linux or macOS host that has network access to the Kubernetes cluster.
+The NetApp DataOps Toolkit for Kubernetes can be utilized from any Linux or macOS client that has network access to the Kubernetes cluster.
 
-The toolkit requires that a valid kubeconfig file be present on the local host, located at `$HOME/.kube/config` or at another path specified by the `KUBECONFIG` environment variable. Refer to the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/) for more information regarding kubeconfig files.
+The toolkit requires that a valid kubeconfig file be present on the client, located at `$HOME/.kube/config` or at another path specified by the `KUBECONFIG` environment variable. Refer to the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/) for more information regarding kubeconfig files.
 
 ## Getting Started: In-cluster Usage (for advanced Kubernetes users)
 
@@ -71,6 +72,10 @@ Refer to the [Kubernetes documentation](https://kubernetes.io/docs/tasks/run-app
 
 The NetApp DataOps Toolkit for Kubernetes provides the following capabilities.
 
+### MCP Server
+
+The NetApp DataOps Toolkit for Kubernetes includes an [MCP Server](docs/mcp_server_k8s.md) that exposes many of the [Workspace Management](docs/workspace_management.md) and [Volume Management](docs/volume_management.md) capabilities as tools that can be utilized by AI agents.
+
 ### Workspace Management
 
 The NetApp DataOps Toolkit can be used to manage data science workspaces within a Kubernetes cluster. Some of the key capabilities that the toolkit provides are the ability to provision a new JupyterLab workspace, the ability to almost instantaneously clone a JupyterLab workspace, and the ability to almost instantaneously save off a snapshot of a JupyterLab workspace for traceability/baselining.

netapp_dataops_k8s/docs/mcp_server_k8s.md

@@ -0,0 +1,80 @@
+# NetApp DataOps Toolkit for Kubernetes MCP Server
+
+## Description
+
+NetApp DataOps Toolkit MCP Server is an open-source, Python-based server component that makes your Kubernetes DataOps environments accessible via the Model Context Protocol (MCP). The MCP server enables standardized, interactive, and programmatic connectivity between DataOps resources and modern ML/ data platforms supporting the MCP standard.
+
+>[!NOTE]
+>This MCP server uses the stdio transport, as shown in the [MCP Server Quickstart](https://modelcontextprotocol.io/quickstart/server), making it a "local MCP server". 
+
+## Available Tools
+
+The MCP server provides the following tools for managing JupyterLab workspaces and volumes in a Kubernetes environment:
+
+### Workspace Management Tools
+
+- **CreateJupyterLab**: Create a new JupyterLab workspace.
+- **CloneJupyterLab**: Clone an existing JupyterLab workspace.
+- **ListJupyterLabs**: List all JupyterLab workspaces.
+- **CreateJupyterLabSnapshot**: Create a snapshot of a JupyterLab workspace.
+- **ListJupyterLabSnapshots**: List all snapshots of JupyterLab workspaces.
+
+### Volume Management Tools
+
+- **CreateVolume**: Create a new volume.
+- **CloneVolume**: Clone an existing volume.
+- **ListVolumes**: List all volumes.
+- **CreateVolumeSnapshot**: Create a snapshot of a volume.
+- **ListVolumeSnapshots**: List all snapshots of volumes.
+
+## Quick Start
+
+### Prerequisites
+
+- Python >= 3.10
+- [uv](https://docs.astral.sh/uv/) or [pip](https://pypi.org/project/pip/)
+- Access to a Kubernetes environment with NetApp Trident installed and configured. Refer to [the main README](../README.md) for full compatibility details.
+
+To run the MCP tools from the MCP server, a valid kubeconfig file must be present on the local host. Refer to [the "Getting Started: Standard Usage" section from the main README](../README.md#getting-started) of the NetApp DataOps Toolkit for Kubernetes to learn more.
+
+### Usage Instructions
+
+#### Run with uv (recommended)
+
+To run the MCP server using uv, run the following command. You do not need to install the NetApp DataOps Toolkit package before running this command.
+
+```sh
+uvx --from netapp-dataops-k8s netapp_dataops_k8s_mcp.py
+```
+
+#### Install with pip and run from PATH
+
+To install the NetApp DataOps Toolkit for Kubernetes, run the following command.
+
+```sh
+python3 -m pip install netapp-dataops-k8s
+```
+
+After installation, the netapp_dataops_k8s_mcp.py command will be available in your PATH for direct usage.
+
+#### Usage
+
+##### Example JSON Config
+
+To use the MCP server with an MCP client, you need to configure the client to use the server. For many clients (such as [VS Code](https://code.visualstudio.com/docs/copilot/chat/mcp-servers), [Claude Desktop](https://modelcontextprotocol.io/quickstart/user), and [AnythingLLM](https://docs.anythingllm.com/mcp-compatibility/overview)), this requires editing a config file that is in JSON format. Below is an example. Refer to the documentation for your MCP client for specific formatting details.
+
+```json
+{
+  "mcpServers": {
+    "netapp_dataops_k8s_mcp": {
+      "type": "stdio",
+      "command": "uvx",
+      "args": [
+        "--from",
+        "netapp-dataops-k8s",
+        "netapp_dataops_k8s_mcp.py"
+      ]
+    }
+  }
+}
+```

netapp_dataops_k8s/netapp_dataops/k8s/__init__.py

@@ -1148,8 +1148,10 @@ def create_jupyter_lab_snapshot(workspace_name: str, snapshot_name: str = None,
     if print_output:
         print(
             "Creating VolumeSnapshot for JupyterLab workspace '" + workspace_name + "' in namespace '" + namespace + "'...")
-    create_volume_snapshot(pvc_name=_get_jupyter_lab_workspace_pvc_name(workspaceName=workspace_name), snapshot_name=snapshot_name,
+    snapshot_name = create_volume_snapshot(pvc_name=_get_jupyter_lab_workspace_pvc_name(workspaceName=workspace_name), snapshot_name=snapshot_name,
                            volume_snapshot_class=volume_snapshot_class, namespace=namespace, print_output=print_output)
+    
+    return snapshot_name 
 
 
 def create_k8s_config_map(name: str, data: dict, namespace: str = 'default', labels: dict = None,
@@ -1362,6 +1364,8 @@ def create_volume_snapshot(pvc_name: str, snapshot_name: str = None, volume_snap
     if print_output:
         print("Snapshot successfully created.")
 
+    return snapshot_name
+
 
 def delete_jupyter_lab(workspace_name: str, namespace: str = "default", preserve_snapshots: bool = False,
                        print_output: bool = False):