From b90542f21e48455a1871be8767e71e2303da0ccf Mon Sep 17 00:00:00 2001
From: "Srivastava, Piyush" <Piyush.Srivastava@netapp.com>
Date: Tue, 28 Apr 2026 15:47:55 +0530
Subject: [PATCH] bugfix/CSTACKEX-169: Fix enum case sensitive issues

---
 .../cloudstack/storage/feign/model/ExportRule.java   |  7 ++++++-
 .../cloudstack/storage/feign/model/Igroup.java       | 12 ++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java
index 087e9aa681b4..cd0adb1c338d 100644
--- a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java
+++ b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java
@@ -19,9 +19,11 @@
 
 package org.apache.cloudstack.storage.feign.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.List;
 
 /**
@@ -54,6 +56,7 @@ public enum ProtocolsEnum {
             this.value = value;
         }
 
+        @JsonValue
         public String getValue() {
             return value;
         }
@@ -63,9 +66,11 @@ public String toString() {
             return String.valueOf(value);
         }
 
+        @JsonCreator
         public static ProtocolsEnum fromValue(String text) {
+            if (text == null) return null;
             for (ProtocolsEnum b : ProtocolsEnum.values()) {
-                if (String.valueOf(b.value).equals(text)) {
+                if (b.value.equalsIgnoreCase(text)) {
                     return b;
                 }
             }
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java
index 3596a802f941..9d68f405b813 100644
--- a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java
+++ b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java
@@ -19,9 +19,11 @@
 
 package org.apache.cloudstack.storage.feign.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 import java.util.List;
 import java.util.Objects;
@@ -71,6 +73,7 @@ public enum OsTypeEnum {
             this.value = value;
         }
 
+        @JsonValue
         public String getValue() {
             return value;
         }
@@ -80,9 +83,11 @@ public String toString() {
             return String.valueOf(value);
         }
 
+        @JsonCreator
         public static OsTypeEnum fromValue(String text) {
+            if (text == null) return null;
             for (OsTypeEnum b : OsTypeEnum.values()) {
-                if (String.valueOf(b.value).equals(text)) {
+                if (b.value.equalsIgnoreCase(text)) {
                     return b;
                 }
             }
@@ -122,6 +127,7 @@ public enum ProtocolEnum {
             this.value = value;
         }
 
+        @JsonValue
         public String getValue() {
             return value;
         }
@@ -131,9 +137,11 @@ public String toString() {
             return String.valueOf(value);
         }
 
+        @JsonCreator
         public static ProtocolEnum fromValue(String text) {
+            if (text == null) return null;
             for (ProtocolEnum b : ProtocolEnum.values()) {
-                if (String.valueOf(b.value).equals(text)) {
+                if (b.value.equalsIgnoreCase(text)) {
                     return b;
                 }
             }