make updates to rollback cli

Author: indusridhar

src/aks-preview/azext_aks_preview/custom.py

@@ -2200,24 +2200,18 @@ def aks_agentpool_rollback(cmd,   # pylint: disable=unused-argument
                            if_match=None,
                            if_none_match=None,
                            no_wait=False):
-    """Rollback a nodepool to N-1 (previously used configuration)."""
+    """Rollback a nodepool to a previously used configuration."""
+
+    # Require at least one version to be specified
+    if not kubernetes_version and not node_image_version:
+        raise RequiredArgumentMissingError(
+            "Please specify at least one of --kubernetes-version or --node-image-version. "
+            "Use 'az aks nodepool get-rollback-versions' to see available rollback versions."
+        )
 
     # Get the current agent pool
     current_agentpool = client.get(resource_group_name, cluster_name, nodepool_name)
 
-    # Get upgrade profile to get recently used versions
-    upgrade_profile = client.get_upgrade_profile(resource_group_name, cluster_name, nodepool_name)
-
-    # Check if rollback versions are available
-    if not upgrade_profile.recently_used_versions:
-        raise CLIError("No rollback versions are available for this nodepool.")
-
-    # If no specific versions are provided, use the most recent (N-1) version
-    if not kubernetes_version and not node_image_version:
-        most_recent = upgrade_profile.recently_used_versions[0]
-        kubernetes_version = most_recent.orchestrator_version
-        node_image_version = most_recent.node_image_version
-
     # Update the agent pool configuration with rollback versions
     if kubernetes_version:
         current_agentpool.orchestrator_version = kubernetes_version

src/aks-preview/azext_aks_preview/tests/latest/test_aks_commands.py

@@ -20734,7 +20734,7 @@ def test_aks_nodepool_rollback(self, resource_group, resource_group_location):
 
         self.kwargs.update({"upgrade_version": upgrade_version})
 
-        # Upgrade the nodepool to populate rollback versions
+        # Upgrade the nodepool to create rollback history
         upgrade_cmd = (
             "aks nodepool upgrade "
             "--resource-group={resource_group} "
@@ -20750,25 +20750,26 @@ def test_aks_nodepool_rollback(self, resource_group, resource_group_location):
             ],
         )
 
-        # Test case 1: Rollback to N-1 (without specifying versions)
-        rollback_n1_cmd = (
+        # Test case 1: Rollback with only kubernetes-version specified
+        self.kwargs.update({"k8s_version": original_k8s_version})
+        rollback_k8s_only_cmd = (
             "aks nodepool rollback "
             "--resource-group={resource_group} "
             "--cluster-name={name} "
-            "--name={node_pool_name}"
+            "--name={node_pool_name} "
+            "--kubernetes-version={k8s_version}"
         )
-        rollback_result = self.cmd(
-            rollback_n1_cmd,
+        rollback_k8s_result = self.cmd(
+            rollback_k8s_only_cmd,
             checks=[
                 self.check("provisioningState", "Succeeded"),
             ],
         ).get_output_in_json()
 
-        # Verify that the nodepool rolled back to the original versions
-        assert rollback_result["currentOrchestratorVersion"] == original_k8s_version
-        assert rollback_result["nodeImageVersion"] == original_node_image_version
+        # Verify that kubernetes version was rolled back
+        assert rollback_k8s_result["currentOrchestratorVersion"] == original_k8s_version
 
-        # Upgrade again for testing specific version rollback scenarios
+        # Upgrade again for testing node image only rollback
         upgrade_cmd_2 = (
             "aks nodepool upgrade "
             "--resource-group={resource_group} "
@@ -20784,26 +20785,26 @@ def test_aks_nodepool_rollback(self, resource_group, resource_group_location):
             ],
         )
 
-        # Test case 2: Rollback with only kubernetes-version specified
-        self.kwargs.update({"k8s_version": original_k8s_version})
-        rollback_k8s_only_cmd = (
+        # Test case 2: Rollback with only node-image-version specified
+        self.kwargs.update({"original_node_image_version": original_node_image_version})
+        rollback_node_image_only_cmd = (
             "aks nodepool rollback "
             "--resource-group={resource_group} "
             "--cluster-name={name} "
             "--name={node_pool_name} "
-            "--kubernetes-version={k8s_version}"
+            "--node-image-version={original_node_image_version}"
         )
-        rollback_k8s_result = self.cmd(
-            rollback_k8s_only_cmd,
+        rollback_node_image_result = self.cmd(
+            rollback_node_image_only_cmd,
             checks=[
                 self.check("provisioningState", "Succeeded"),
             ],
         ).get_output_in_json()
 
-        # Verify that only kubernetes version was rolled back
-        assert rollback_k8s_result["currentOrchestratorVersion"] == original_k8s_version
+        # Verify that node image version was rolled back
+        assert rollback_node_image_result["nodeImageVersion"] == original_node_image_version
 
-        # Upgrade once more for testing both versions specified
+        # Upgrade again for testing both versions specified
         upgrade_cmd_3 = (
             "aks nodepool upgrade "
             "--resource-group={resource_group} "