Skip to content

improvement(offering): make network mode mandatory when creating vpc … #13622

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
Chinmay048 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

improvement(offering): make network mode mandatory when creating vpc … #13622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 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 @@ -153,11 +153,8 @@ public abstract class NetworkOfferingBaseCmd extends BaseCmd {
since = "4.20.0")
private Boolean nsxSupportsInternalLbService;

@Parameter(name = ApiConstants.NETWORK_MODE,
type = CommandType.STRING,
description = "Indicates the mode with which the network will operate. Valid option: NATTED or ROUTED",
since = "4.20.0")
private String networkMode;
@Parameter(name = ApiConstants.NETWORK_MODE, type = CommandType.STRING, required = true, description = "the network mode for the network offering")
private String networkMode;
Comment on lines +156 to +157

@Parameter(name = ApiConstants.FOR_TUNGSTEN,
type = CommandType.BOOLEAN,
Expand Down
5 changes: 1 addition & 4 deletions api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,7 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
since = "4.16")
private Boolean enable;

@Parameter(name = ApiConstants.NETWORK_MODE,
type = CommandType.STRING,
description = "Indicates the mode with which the network will operate. Valid option: NATTED or ROUTED",
since = "4.20.0")
@Parameter(name = ApiConstants.NETWORK_MODE, type = CommandType.STRING, required = true, description = "the network mode for the VPC offering")
private String networkMode;
Comment on lines +147 to 148

@Parameter(name = ApiConstants.SPECIFY_AS_NUMBER, type = CommandType.BOOLEAN, since = "4.20.0",
Expand Down
2 changes: 2 additions & 0 deletions ui/src/views/offering/AddNetworkOffering.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,8 @@ export default {
})
this.rules = reactive({
name: [{ required: true, message: this.$t('message.error.name') }],
// ADD THIS LINE:
networkmode: [{ required: true, message: this.$t('message.error.select') }],
Comment on lines +714 to +715
networkrate: [{ type: 'number', validator: this.validateNumber }],
serviceofferingid: [{ required: true, message: this.$t('message.error.select') }],
domainid: [{ type: 'array', required: true, message: this.$t('message.error.select') }],
Expand Down
2 changes: 2 additions & 0 deletions ui/src/views/offering/AddVpcOffering.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,8 @@ export default {
})
this.rules = reactive({
name: [{ required: true, message: this.$t('message.error.name') }],
// ADD THIS LINE:
networkmode: [{ required: true, message: this.$t('message.error.select') }],
Comment on lines +369 to +370
domainid: [{ type: 'array', required: true, message: this.$t('message.error.select') }],
zoneid: [{
type: 'array',
Expand Down