Skip to content

server: fix clone network offerings with detail internetProtocol=IPv4 #13615

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

Draft
weizhouapache wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −4
Draft

server: fix clone network offerings with detail internetProtocol=IPv4 #13615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34b80e7
server: fix clone network offerings with detail internetProtocol=IPv4
weizhouapache Jul 14, 2026
297185e
use HashSet instead of List
weizhouapache Jul 14, 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
5 changes: 3 additions & 2 deletions ...src/main/java/org/apache/cloudstack/api/command/admin/network/NetworkOfferingBaseCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ public abstract class NetworkOfferingBaseCmd extends BaseCmd {
description = "the routing mode for the network offering. Supported types are: Static or Dynamic.")
private String routingMode;

private Map<String, String> sourceDetailsMap;

/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
Expand Down Expand Up @@ -430,9 +432,8 @@ public Map<Network.Capability, String> getServiceCapabilities(Network.Service se

public Map<String, String> getDetails() {
if (details == null || details.isEmpty()) {
return null;
return sourceDetailsMap;
}
Comment on lines 433 to 436
Comment on lines 433 to 436

Collection paramsCollection = details.values();
Object objlist[] = paramsCollection.toArray();
Map<String, String> params = (Map<String, String>) (objlist[0]);
Expand Down
7 changes: 5 additions & 2 deletions server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8486,8 +8486,11 @@ private void applySourceOfferingValuesToCloneCmd(CloneNetworkOfferingCmd cmd,
private Map<String, String> getSourceOfferingDetails(Long sourceOfferingId) {
List<NetworkOfferingDetailsVO> sourceDetailsVOs = networkOfferingDetailsDao.listDetails(sourceOfferingId);
Map<String, String> sourceDetailsMap = new HashMap<>();
Set<String> ignoredSourceDetails = new HashSet<>(Arrays.asList(Detail.internetProtocol.name(), Detail.domainid.name(), Detail.zoneid.name()));
for (NetworkOfferingDetailsVO detailVO : sourceDetailsVOs) {
sourceDetailsMap.put(detailVO.getName(), detailVO.getValue());
if (!ignoredSourceDetails.contains(detailVO.getName())) {
sourceDetailsMap.put(detailVO.getName(), detailVO.getValue());
}
}
return sourceDetailsMap;
}
Expand Down Expand Up @@ -8635,7 +8638,7 @@ private void applyResolvedValuesToCommand(CloneNetworkOfferingCmd cmd, NetworkOf

if (cmd.getDetails() == null || cmd.getDetails().isEmpty()) {
if (!sourceDetailsMap.isEmpty()) {
setField(cmd, "details", sourceDetailsMap);
setField(cmd, "sourceDetailsMap", sourceDetailsMap);
}
Comment thread
weizhouapache marked this conversation as resolved.
}

Expand Down
Loading