Skip to content

Enable defining a network as redundant during restart through the UI #7405

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
GaOrtiga wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −3
Open

Enable defining a network as redundant during restart through the UI #7405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37da6da
redundant networks
Mar 30, 2023
cc7eb93
addConfig
Jan 6, 2026
92b08e9
Update server/src/main/java/com/cloud/network/NetworkServiceImpl.java
GaOrtiga Jan 8, 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
12 changes: 10 additions & 2 deletions server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
private static final ConfigKey<Boolean> AllowEmptyStartEndIpAddress = new ConfigKey<>("Advanced", Boolean.class,
"allow.empty.start.end.ipaddress", "true", "Allow creating network without mentioning start and end IP address",
true, ConfigKey.Scope.Account);
public static final ConfigKey<Boolean> AllowUsersToMakeNetworksRedundant = new ConfigKey<>("Advanced", Boolean.class,
"allow.users.to.make.networks.redundant", "true", "Allow Users to make Networks Redundant",
true, ConfigKey.Scope.Global);
private static final long MIN_VLAN_ID = 0L;
private static final long MAX_VLAN_ID = 4095L; // 2^12 - 1
private static final long MIN_GRE_KEY = 0L;
Expand Down Expand Up @@ -2986,8 +2989,13 @@ public boolean restartNetwork(RestartNetworkCmd cmd) throws ConcurrentOperationE
throwInvalidIdException("Cannot restart a VPC tier with cleanup, please restart the whole VPC.", network.getUuid(), "network tier");
}
boolean makeRedundant = cmd.getMakeRedundant();
boolean livePatch = cmd.getLivePatch();
User callerUser = _accountMgr.getActiveUser(CallContext.current().getCallingUserId());
if (makeRedundant && !_accountMgr.isRootAdmin(callerUser.getAccountId()) && !AllowUsersToMakeNetworksRedundant.value() ) {
throw new InvalidParameterValueException("Could not make the network redundant. Please contact administrator.");
AllowUsersToMakeNetworksRedundant.key()));
Copy link
Contributor

@sureshanaparti sureshanaparti Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AllowUsersToMakeNetworksRedundant.key()));

Copy link
Contributor

@DaanHoogland DaanHoogland Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sureshanaparti , this is a syntax error. I think I know what you mean, but let’s not apply this.

}

boolean livePatch = cmd.getLivePatch();
return restartNetwork(network, cleanup, makeRedundant, livePatch, callerUser);
}

Expand Down Expand Up @@ -6266,7 +6274,7 @@ public String getConfigComponentName() {

@Override
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[] {AllowDuplicateNetworkName, AllowEmptyStartEndIpAddress, VRPrivateInterfaceMtu, VRPublicInterfaceMtu, AllowUsersToSpecifyVRMtu};
return new ConfigKey<?>[] {AllowDuplicateNetworkName, AllowEmptyStartEndIpAddress, AllowUsersToMakeNetworksRedundant, VRPrivateInterfaceMtu, VRPublicInterfaceMtu, AllowUsersToSpecifyVRMtu};
}

public boolean isDefaultAcl(Long aclId) {
Expand Down
5 changes: 4 additions & 1 deletion ui/src/config/section/network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,16 @@ export default {
if (isGroupAction || record.vpcid == null) {
fields.push('cleanup')
}
if (!record.redundantrouter) {
fields.push('makeredundant')
}
fields.push('livepatch')
return fields
},
show: (record) => record.type !== 'L2',
groupAction: true,
popup: true,
groupMap: (selection, values) => { return selection.map(x => { return { id: x, cleanup: values.cleanup } }) }
groupMap: (selection, values) => { return selection.map(x => { return { id: x, cleanup: values.cleanup, makeredundant: values.makeredundant } }) }
},
{
api: 'replaceNetworkACLList',
Expand Down
Loading