Skip to content

Addition of description field for NIC's secondary IP addresses #12864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erikbocks wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Addition of description field for NIC's secondary IP addresses #12864

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bedd77f
Addition of description field for NIC's secondary IP addresses
erikbocks Mar 19, 2026
02a1d07
Address copilot's review
erikbocks Mar 20, 2026
c19b7cb
Merge remote-tracking branch 'origin/main' into add-description-for-s…
erikbocks Apr 14, 2026
584ae62
Add newline at the end of file
erikbocks Apr 15, 2026
55a6288
Address Wei's label changes
erikbocks Apr 16, 2026
711006e
Remove colon from label
erikbocks Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address copilot's review
  • Loading branch information
@erikbocks
erikbocks committed Mar 20, 2026
commit 02a1d071fcca9b67975f68c3365d4d55cd774b9e
2 changes: 1 addition & 1 deletion api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ private boolean enableStaticNat(long ipId, long vmId, long networkId, boolean is
boolean isOneToOneNat = ipAddress.isOneToOneNat();
Long associatedWithVmId = ipAddress.getAssociatedWithVmId();
Nic guestNic;
wNicSecondaryIpVO nicSecIp = null;
NicSecondaryIpVO nicSecIp = null;
String dstIp = null;
Network network = _networkModel.getNetwork(networkId);

Expand Down
3 changes: 1 addition & 2 deletions ui/src/views/network/NicsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/network/NicsTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Loading