This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch nsx-refactor-update-offering in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 12fb9ecf321af0c87eb394d666ab0c05da0deebe Author: Pearl Dsilva <[email protected]> AuthorDate: Mon Oct 23 11:01:14 2023 -0400 address comments: rename param --- .../java/com/cloud/offering/NetworkOffering.java | 4 ++-- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../admin/network/CreateNetworkOfferingCmd.java | 16 +++++++------- .../command/admin/vpc/CreateVPCOfferingCmd.java | 16 +++++++------- .../admin/vpc/CreateVPCOfferingCmdTest.java | 6 +++--- .../com/cloud/offerings/NetworkOfferingVO.java | 12 +++++------ .../resources/META-INF/db/schema-41810to41900.sql | 8 +++---- .../main/java/com/cloud/api/ApiResponseHelper.java | 2 +- .../cloud/api/query/vo/NetworkOfferingJoinVO.java | 12 +++++------ .../configuration/ConfigurationManagerImpl.java | 21 ++++++++++++------ .../java/com/cloud/network/vpc/VpcManagerImpl.java | 25 ++++++++++++++-------- .../com/cloud/server/ConfigurationServerImpl.java | 8 +++---- ui/public/locales/en.json | 1 + ui/src/config/section/offering.js | 4 ++-- ui/src/views/offering/AddNetworkOffering.vue | 10 ++++----- ui/src/views/offering/AddVpcOffering.vue | 10 ++++----- 16 files changed, 86 insertions(+), 70 deletions(-) diff --git a/api/src/main/java/com/cloud/offering/NetworkOffering.java b/api/src/main/java/com/cloud/offering/NetworkOffering.java index 15bce42dd95..6a68ab1246a 100644 --- a/api/src/main/java/com/cloud/offering/NetworkOffering.java +++ b/api/src/main/java/com/cloud/offering/NetworkOffering.java @@ -43,7 +43,7 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity, InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RelatedNetworkOffering, domainid, zoneid, pvlanType, internetProtocol } - public enum Mode { + public enum NsxMode { NATTED, ROUTED } @@ -99,7 +99,7 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity, boolean isForNsx(); - String getMode(); + String getNsxMode(); TrafficType getTrafficType(); diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 3329f42bfc9..7448f8c6e41 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -292,6 +292,7 @@ public class ApiConstants { public static final String MIGRATION_TYPE = "migrationtype"; public static final String MEMORY = "memory"; public static final String MODE = "mode"; + public static final String NSX_MODE = "nsxmode"; public static final String NAME = "name"; public static final String METHOD_NAME = "methodname"; public static final String NETWORK_DOMAIN = "networkdomain"; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java index 698bee50c08..e12ab53c073 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java @@ -145,11 +145,11 @@ public class CreateNetworkOfferingCmd extends BaseCmd { since = "4.20.0") private Boolean forNsx; - @Parameter(name = ApiConstants.MODE, + @Parameter(name = ApiConstants.NSX_MODE, type = CommandType.STRING, - description = "Indicates the mode with which the network will operate. Valid option: NAT or Route", + description = "Indicates the mode with which the network will operate. Valid option: NATTED or ROUTED", since = "4.20.0") - private String mode; + private String nsxMode; @Parameter(name = ApiConstants.FOR_TUNGSTEN, type = CommandType.BOOLEAN, @@ -282,12 +282,12 @@ public class CreateNetworkOfferingCmd extends BaseCmd { return forVpc; } - public Boolean getForNsx() { + public Boolean isForNsx() { return forNsx; } - public String getMode() { - return mode; + public String getNsxMode() { + return nsxMode; } public Boolean getForTungsten() { @@ -311,7 +311,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd { public Map<String, List<String>> getServiceProviders() { Map<String, List<String>> serviceProviderMap = new HashMap<String, List<String>>(); - if (serviceProviderList != null && !serviceProviderList.isEmpty() && !getForNsx()) { + if (serviceProviderList != null && !serviceProviderList.isEmpty() && !isForNsx()) { Collection servicesCollection = serviceProviderList.values(); Iterator iter = servicesCollection.iterator(); while (iter.hasNext()) { @@ -327,7 +327,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd { providerList.add(provider); serviceProviderMap.put(service, providerList); } - } else { + } else if (Boolean.TRUE.equals(forNsx)) { getServiceProviderMapForNsx(serviceProviderMap); } return serviceProviderMap; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java index 2e73e6b9b14..c55a4571733 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java @@ -120,11 +120,11 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd { since = "4.20.0") private Boolean forNsx; - @Parameter(name = ApiConstants.MODE, + @Parameter(name = ApiConstants.NSX_MODE, type = CommandType.STRING, - description = "Indicates the mode with which the network will operate. Valid option: NAT or Route", + description = "Indicates the mode with which the network will operate. Valid option: NATTED or ROUTED", since = "4.20.0") - private String mode; + private String nsxMode; @Parameter(name = ApiConstants.ENABLE, type = CommandType.BOOLEAN, @@ -163,17 +163,17 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd { return supportedServices; } - public Boolean getForNsx() { + public Boolean isForNsx() { return !Objects.isNull(forNsx) && forNsx; } - public String getMode() { - return mode; + public String getNsxMode() { + return nsxMode; } public Map<String, List<String>> getServiceProviders() { Map<String, List<String>> serviceProviderMap = new HashMap<String, List<String>>();; - if (serviceProviderList != null && !serviceProviderList.isEmpty() && !getForNsx()) { + if (serviceProviderList != null && !serviceProviderList.isEmpty() && !isForNsx()) { Collection<? extends Map<String, String>> servicesCollection = serviceProviderList.values(); Iterator<? extends Map<String, String>> iter = servicesCollection.iterator(); while (iter.hasNext()) { @@ -193,7 +193,7 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd { providerList.add(provider); serviceProviderMap.put(service, providerList); } - } else { + } else if (Boolean.TRUE.equals(forNsx)) { getServiceProviderMapForNsx(serviceProviderMap); } diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java index 16b716d7d63..290a2850c9a 100644 --- a/api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java +++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmdTest.java @@ -52,15 +52,15 @@ public class CreateVPCOfferingCmdTest { IllegalAccessException { CreateVPCOfferingCmd cmd = new CreateVPCOfferingCmd(); ApiCmdTestUtil.set(cmd, ApiConstants.SERVICE_PROVIDER_LIST, new HashMap<String, Map<String, String>>()); - Assert.assertNull(cmd.getServiceProviders()); + Assert.assertTrue(cmd.getServiceProviders().isEmpty()); } @Test - public void getDetailsNull() throws IllegalArgumentException, + public void getDetailsEmpty() throws IllegalArgumentException, IllegalAccessException { CreateVPCOfferingCmd cmd = new CreateVPCOfferingCmd(); ApiCmdTestUtil.set(cmd, ApiConstants.SERVICE_PROVIDER_LIST, null); - Assert.assertNull(cmd.getServiceProviders()); + Assert.assertTrue(cmd.getServiceProviders().isEmpty()); } @Test diff --git a/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java index e3e96c0e830..b2fabf2e3cd 100644 --- a/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java +++ b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java @@ -139,8 +139,8 @@ public class NetworkOfferingVO implements NetworkOffering { @Column(name = "for_nsx") boolean forNsx = false; - @Column(name = "mode") - String mode; + @Column(name = "nsx_mode") + String nsxMode; @Column(name = "egress_default_policy") boolean egressdefaultpolicy; @@ -211,12 +211,12 @@ public class NetworkOfferingVO implements NetworkOffering { } @Override - public String getMode() { - return mode; + public String getNsxMode() { + return nsxMode; } - public void setMode(String mode) { - this.mode = mode; + public void setNsxMode(String nsxMode) { + this.nsxMode = nsxMode; } @Override diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql b/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql index 28d8b195f15..0a461570ac5 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql @@ -214,9 +214,9 @@ BEGIN -- NSX Plugin -- CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.network_offerings','for_nsx', 'int(1) unsigned DEFAULT "0" COMMENT "is nsx enabled for the resource"'); -CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.network_offerings','mode', 'varchar(32) COMMENT "mode in which the network would route traffic"'); +CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.network_offerings','nsx_mode', 'varchar(32) COMMENT "mode in which the network would route traffic"'); CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','for_nsx', 'int(1) unsigned DEFAULT "0" COMMENT "is nsx enabled for the resource"'); -CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','mode', 'varchar(32) COMMENT "mode in which the network would route traffic"'); +CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','nsx_mode', 'varchar(32) COMMENT "mode in which the network would route traffic"'); -- Network offering with NSX related columns DROP VIEW IF EXISTS `cloud`.`network_offering_view`; @@ -262,7 +262,7 @@ SELECT `network_offerings`.`for_vpc` AS `for_vpc`, `network_offerings`.`for_tungsten` AS `for_tungsten`, `network_offerings`.`for_nsx` AS `for_nsx`, - `network_offerings`.`mode` AS `mode`, + `network_offerings`.`nsx_mode` AS `nsx_mode`, `network_offerings`.`service_package_id` AS `service_package_id`, GROUP_CONCAT(DISTINCT(domain.id)) AS domain_id, GROUP_CONCAT(DISTINCT(domain.uuid)) AS domain_uuid, @@ -302,7 +302,7 @@ SELECT `vpc_offerings`.`state` AS `state`, `vpc_offerings`.`default` AS `default`, `vpc_offerings`.`for_nsx` AS `for_nsx`, - `vpc_offerings`.`mode` AS `mode`, + `vpc_offerings`.`nsx_mode` AS `nsx_mode`, `vpc_offerings`.`created` AS `created`, `vpc_offerings`.`removed` AS `removed`, `vpc_offerings`.`service_offering_id` AS `service_offering_id`, diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 2b4fb9dee2e..ac090f0136e 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -2321,7 +2321,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setForVpc(_configMgr.isOfferingForVpc(offering)); response.setForTungsten(offering.isForTungsten()); response.setForNsx(offering.isForNsx()); - response.setMode(offering.getMode()); + response.setMode(offering.getNsxMode()); response.setServices(serviceResponses); //set network offering details Map<Detail, String> details = _ntwkModel.getNtwkOffDetails(offering.getId()); diff --git a/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java index a1e28412853..edae63ff7eb 100644 --- a/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java +++ b/server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java @@ -160,8 +160,8 @@ public class NetworkOfferingJoinVO extends BaseViewVO implements NetworkOffering @Column(name = "for_nsx") boolean forNsx; - @Column(name = "mode") - String mode; + @Column(name = "nsx_mode") + String nsxMode; @Column(name = "service_package_id") private String servicePackageUuid = null; @@ -365,12 +365,12 @@ public class NetworkOfferingJoinVO extends BaseViewVO implements NetworkOffering } @Override - public String getMode() { - return mode; + public String getNsxMode() { + return nsxMode; } - public void setMode(String mode) { - this.mode = mode; + public void setNsxMode(String nsxMode) { + this.nsxMode = nsxMode; } public String getServicePackage() { diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 4f68ea1f6e9..a3029c5db8b 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -5927,9 +5927,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati final Map<String, String> detailsStr = cmd.getDetails(); final Boolean egressDefaultPolicy = cmd.getEgressDefaultPolicy(); Boolean forVpc = cmd.getForVpc(); - Boolean forNsx = cmd.getForNsx(); + Boolean forNsx = cmd.isForNsx(); Boolean forTungsten = cmd.getForTungsten(); - String mode = cmd.getMode(); + String nsxMode = cmd.getNsxMode(); Integer maxconn = null; boolean enableKeepAlive = false; String servicePackageuuid = cmd.getServicePackageId(); @@ -5968,11 +5968,18 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } if (Boolean.TRUE.equals(forNsx)) { - if (Objects.isNull(mode)) { - throw new InvalidParameterValueException("Mode for an NSX offering needs to be specified. Valid values: " + Arrays.toString(NetworkOffering.Mode.values())); + if (Objects.isNull(nsxMode)) { + throw new InvalidParameterValueException("Mode for an NSX offering needs to be specified. Valid values: " + Arrays.toString(NetworkOffering.NsxMode.values())); } - if (!EnumUtils.isValidEnum(NetworkOffering.Mode.class, mode)) { - throw new InvalidParameterValueException("Invalid mode passed. Valid values: " + Arrays.toString(NetworkOffering.Mode.values())); + if (!EnumUtils.isValidEnum(NetworkOffering.NsxMode.class, nsxMode)) { + throw new InvalidParameterValueException("Invalid mode passed. Valid values: " + Arrays.toString(NetworkOffering.NsxMode.values())); + } + } else { + if (Objects.nonNull(nsxMode)) { + if (s_logger.isTraceEnabled()) { + s_logger.trace("nsxMode has is ignored for non-NSX enabled zones"); + } + nsxMode = null; } } @@ -6240,7 +6247,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } final NetworkOfferingVO offering = createNetworkOffering(name, displayText, trafficType, tags, specifyVlan, availability, networkRate, serviceProviderMap, false, guestType, false, - serviceOfferingId, conserveMode, serviceCapabilityMap, specifyIpRanges, isPersistent, details, egressDefaultPolicy, maxconn, enableKeepAlive, forVpc, forTungsten, forNsx, mode, domainIds, zoneIds, enable, internetProtocol); + serviceOfferingId, conserveMode, serviceCapabilityMap, specifyIpRanges, isPersistent, details, egressDefaultPolicy, maxconn, enableKeepAlive, forVpc, forTungsten, forNsx, nsxMode, domainIds, zoneIds, enable, internetProtocol); CallContext.current().setEventDetails(" Id: " + offering.getId() + " Name: " + name); CallContext.current().putContextParameter(NetworkOffering.class, offering.getId()); return offering; diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java index 9527117c861..6e6cfedc2a0 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -385,7 +385,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis } } createVpcOffering(VpcOffering.DEFAULT_VPC_NAT_NSX_OFFERING_NAME, VpcOffering.DEFAULT_VPC_NAT_NSX_OFFERING_NAME, svcProviderMap, false, - State.Enabled, null, false, false, false, true, NetworkOffering.Mode.NATTED.name()); + State.Enabled, null, false, false, false, true, NetworkOffering.NsxMode.NATTED.name()); } @@ -403,7 +403,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis } } createVpcOffering(VpcOffering.DEFAULT_VPC_ROUTE_NSX_OFFERING_NAME, VpcOffering.DEFAULT_VPC_ROUTE_NSX_OFFERING_NAME, svcProviderMap, false, - State.Enabled, null, false, false, false, true, NetworkOffering.Mode.ROUTED.name()); + State.Enabled, null, false, false, false, true, NetworkOffering.NsxMode.ROUTED.name()); } } @@ -463,16 +463,23 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis final Long serviceOfferingId = cmd.getServiceOfferingId(); final List<Long> domainIds = cmd.getDomainIds(); final List<Long> zoneIds = cmd.getZoneIds(); - final Boolean forNsx = cmd.getForNsx(); - final String mode = cmd.getMode(); + final Boolean forNsx = cmd.isForNsx(); + String nsxMode = cmd.getNsxMode(); final boolean enable = cmd.getEnable(); if (Boolean.TRUE.equals(forNsx)) { - if (Objects.isNull(mode)) { - throw new InvalidParameterValueException("Mode for an NSX offering needs to be specified.Valid values: " + Arrays.toString(NetworkOffering.Mode.values())); + if (Objects.isNull(nsxMode)) { + throw new InvalidParameterValueException("Mode for an NSX offering needs to be specified.Valid values: " + Arrays.toString(NetworkOffering.NsxMode.values())); } - if (!EnumUtils.isValidEnum(NetworkOffering.Mode.class, mode)) { - throw new InvalidParameterValueException("Invalid mode passed. Valid values: " + Arrays.toString(NetworkOffering.Mode.values())); + if (!EnumUtils.isValidEnum(NetworkOffering.NsxMode.class, nsxMode)) { + throw new InvalidParameterValueException("Invalid mode passed. Valid values: " + Arrays.toString(NetworkOffering.NsxMode.values())); + } + } else { + if (Objects.nonNull(nsxMode)) { + if (s_logger.isTraceEnabled()) { + s_logger.trace("nsxMode has is ignored for non-NSX enabled zones"); + } + nsxMode = null; } } // check if valid domain @@ -497,7 +504,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis } return createVpcOffering(vpcOfferingName, displayText, supportedServices, - serviceProviderList, serviceCapabilityList, internetProtocol, serviceOfferingId, forNsx, mode, + serviceProviderList, serviceCapabilityList, internetProtocol, serviceOfferingId, forNsx, nsxMode, domainIds, zoneIds, (enable ? State.Enabled : State.Disabled)); } diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java index 415617e7262..f7ada1fccf1 100644 --- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java @@ -1206,12 +1206,12 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } _networkOfferingDao.persistDefaultL2NetworkOfferings(); - // Offering #9 - network offering for nsx provider - NAT mode + // Offering #9 - network offering for nsx provider - NATTED mode NetworkOfferingVO defaultNatNSXNetworkOffering = new NetworkOfferingVO(NetworkOffering.DEFAULT_NAT_NSX_OFFERING, "Offering for NSX enabled networks - NAT mode", TrafficType.Guest, false, false, null, null, true, Availability.Optional, null, GuestType.Isolated, false, false, false, false, false, true); defaultNatNSXNetworkOffering.setForNsx(true); - defaultNatNSXNetworkOffering.setMode(NetworkOffering.Mode.NATTED.name()); + defaultNatNSXNetworkOffering.setNsxMode(NetworkOffering.NsxMode.NATTED.name()); defaultNatNSXNetworkOffering.setState(NetworkOffering.State.Enabled); defaultNatNSXNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultNatNSXNetworkOffering); @@ -1222,12 +1222,12 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio s_logger.trace("Added service for the network offering: " + offService); } - // Offering #10 - network offering for nsx provider - Route mode + // Offering #10 - network offering for nsx provider - ROUTED mode NetworkOfferingVO defaultRouteNSXNetworkOffering = new NetworkOfferingVO(NetworkOffering.DEFAULT_NAT_NSX_OFFERING, "Offering for NSX enabled networks - NAT mode", TrafficType.Guest, false, false, null, null, true, Availability.Optional, null, GuestType.Isolated, false, false, false, false, false, true); defaultRouteNSXNetworkOffering.setForNsx(true); - defaultRouteNSXNetworkOffering.setMode(NetworkOffering.Mode.ROUTED.name()); + defaultRouteNSXNetworkOffering.setNsxMode(NetworkOffering.NsxMode.ROUTED.name()); defaultRouteNSXNetworkOffering.setState(NetworkOffering.State.Enabled); defaultRouteNSXNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultRouteNSXNetworkOffering); diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 205128d58f4..43cb291e8db 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -1380,6 +1380,7 @@ "label.not.suitable": "Not suitable", "label.notifications": "Notifications", "label.nsx": "NSX", +"label.nsx.mode": "NSX Mode", "label.nsx.provider": "NSX Provider", "label.nsx.provider.name": "NSX provider name", "label.nsx.provider.hostname": "NSX provider hostname", diff --git a/ui/src/config/section/offering.js b/ui/src/config/section/offering.js index 4e7151c08dc..df4e264276b 100644 --- a/ui/src/config/section/offering.js +++ b/ui/src/config/section/offering.js @@ -262,7 +262,7 @@ export default { docHelp: 'adminguide/networking.html#network-offerings', permission: ['listNetworkOfferings'], columns: ['name', 'state', 'guestiptype', 'traffictype', 'networkrate', 'domain', 'zone', 'order'], - details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'internetprotocol', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'forvpc', 'fornsx', 'mode', 'service', 'tags', 'domain', 'zone'], + details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'internetprotocol', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'forvpc', 'fornsx', 'nsxmode', 'service', 'tags', 'domain', 'zone'], resourceType: 'NetworkOffering', tabs: [ { @@ -355,7 +355,7 @@ export default { permission: ['listVPCOfferings'], resourceType: 'VpcOffering', columns: ['name', 'state', 'displaytext', 'domain', 'zone', 'order'], - details: ['name', 'id', 'displaytext', 'internetprotocol', 'distributedvpcrouter', 'tags', 'service', 'fornsx', 'mode', 'domain', 'zone', 'created'], + details: ['name', 'id', 'displaytext', 'internetprotocol', 'distributedvpcrouter', 'tags', 'service', 'fornsx', 'nsxmode', 'domain', 'zone', 'created'], related: [{ name: 'vpc', title: 'label.vpc', diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue index cc69854ddd3..5af0c000165 100644 --- a/ui/src/views/offering/AddNetworkOffering.vue +++ b/ui/src/views/offering/AddNetworkOffering.vue @@ -129,18 +129,18 @@ </a-form-item> </a-col> </a-row> - <a-form-item name="mode" ref="mode" v-if="forNsx"> + <a-form-item name="nsxmode" ref="nsxmode" v-if="forNsx"> <template #label> - <tooltip-label :title="$t('label.mode')" :tooltip="apiParams.mode.description"/> + <tooltip-label :title="$t('label.nsx.mode')" :tooltip="apiParams.nsxmode.description"/> </template> <a-select v-if="showMode" optionFilterProp="label" - v-model:value="form.mode" + v-model:value="form.nsxmode" :filterOption="(input, option) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }" - :placeholder="apiParams.mode.description"> + :placeholder="apiParams.nsxmode.description"> <a-select-option v-for="(opt) in modes" :key="opt.name" :label="opt.name"> {{ opt.name }} </a-select-option> @@ -987,7 +987,7 @@ export default { } if (values.fornsx === true) { params.fornsx = true - params.mode = values.mode + params.nsxmode = values.nsxmode } if (values.guestiptype === 'shared' || values.guestiptype === 'isolated') { if (values.conservemode !== true) { diff --git a/ui/src/views/offering/AddVpcOffering.vue b/ui/src/views/offering/AddVpcOffering.vue index 3cb4d5d362e..0da1fceb4f3 100644 --- a/ui/src/views/offering/AddVpcOffering.vue +++ b/ui/src/views/offering/AddVpcOffering.vue @@ -77,18 +77,18 @@ </a-form-item> </a-col> </a-row> - <a-form-item name="mode" ref="mode" v-if="forNsx"> + <a-form-item name="nsxmode" ref="nsxmode" v-if="forNsx"> <template #label> - <tooltip-label :title="$t('label.mode')" :tooltip="apiParams.mode.description"/> + <tooltip-label :title="$t('label.nsx.mode')" :tooltip="apiParams.nsxmode.description"/> </template> <a-select v-if="showMode" optionFilterProp="label" - v-model:value="form.mode" + v-model:value="form.nsxmode" :filterOption="(input, option) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }" - :placeholder="apiParams.mode.description"> + :placeholder="apiParams.nsxmode.description"> <a-select-option v-for="(opt) in modes" :key="opt.name" :label="opt.name"> {{ opt.name }} </a-select-option> @@ -560,7 +560,7 @@ export default { } if (values.fornsx === true) { params.fornsx = true - params.mode = values.mode + params.nsxmode = values.nsxmode } if (this.selectedServiceProviderMap != null) { var supportedServices = Object.keys(this.selectedServiceProviderMap)
