From 02a1d071fcca9b67975f68c3365d4d55cd774b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20B=C3=B6ck?= <erik.bock@outlook.com>
Date: Fri, 20 Mar 2026 08:00:52 -0300
Subject: [PATCH] Address copilot's review

---
 .../apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java | 2 +-
 .../main/java/com/cloud/network/rules/RulesManagerImpl.java    | 2 +-
 ui/src/views/network/NicsTab.vue                               | 3 +--
 ui/src/views/network/NicsTable.vue                             | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
index 1d0b51c97a6..7f224d10b03 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
@@ -56,7 +56,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCreateCmd {
     @Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, required = false, description = "Secondary IP Address")
     private String ipAddr;
 
-    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = false, description = "Description")
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = false, description = "Description", length = 2048)
     private String description;
 
     /////////////////////////////////////////////////////
diff --git a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
index d73c097a6e9..bb3ee8d7624 100644
--- a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
@@ -467,7 +467,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
         boolean isOneToOneNat = ipAddress.isOneToOneNat();
         Long associatedWithVmId = ipAddress.getAssociatedWithVmId();
         Nic guestNic;
-        wNicSecondaryIpVO nicSecIp = null;
+        NicSecondaryIpVO nicSecIp = null;
         String dstIp = null;
         Network network = _networkModel.getNetwork(networkId);
 
diff --git a/ui/src/views/network/NicsTab.vue b/ui/src/views/network/NicsTab.vue
index 1e4179d1d59..eb652a7b6ac 100644
--- a/ui/src/views/network/NicsTab.vue
+++ b/ui/src/views/network/NicsTab.vue
@@ -218,8 +218,7 @@
           <p class="modal-form__label">{{ $t('label.secondaryip.description') }}</p>
           <a-input
             :placeholder="$t('label.new.secondaryip.description.description')"
-            v-model:value="newSecondaryIpDescription"
-            v-focus="editNicResource.type!=='Shared'"></a-input>
+            v-model:value="newSecondaryIpDescription"></a-input>
         </div>
 
         <div style="margin-top: 10px; display: flex; justify-content:flex-end;">
diff --git a/ui/src/views/network/NicsTable.vue b/ui/src/views/network/NicsTable.vue
index 98d8cbff337..d44a6219d2c 100644
--- a/ui/src/views/network/NicsTable.vue
+++ b/ui/src/views/network/NicsTable.vue
@@ -39,7 +39,7 @@
           {{ record.traffictype }}
         </a-descriptions-item>
         <a-descriptions-item :label="$t('label.secondaryips')" v-if="record.secondaryip && record.secondaryip.length > 0 && record.type !== 'L2'">
-          {{ record.secondaryip.map(x => x.ipaddress + ': ' + x.description ).join(', ') }}
+          {{ record.secondaryip.map(x => x.description ? (x.ipaddress + ': ' + x.description) : x.ipaddress).join(', ') }}
         </a-descriptions-item>
         <a-descriptions-item :label="$t('label.ip6address')" v-if="record.ip6address">
           {{ record.ip6address }}