This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch nsx-add-lb-rule in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 75342c7200aabb752eabcfc2fc98d86a9c3101fb Merge: 8b1933f1731 ce1659e8fcc Author: Pearl Dsilva <[email protected]> AuthorDate: Mon Oct 30 19:52:53 2023 -0400 Merge branch 'nsx-integration' of https://github.com/apache/cloudstack into nsx-add-lb-rule .../org/apache/cloudstack/api/ApiConstants.java | 2 ++ .../admin/network/CreateNetworkOfferingCmd.java | 5 ++-- .../command/admin/vlan/CreateVlanIpRangeCmd.java | 9 ++++++- .../command/admin/vpc/CreateVPCOfferingCmd.java | 4 +-- .../api/response/VlanIpRangeResponse.java | 8 ++++++ .../cloud/configuration/ConfigurationManager.java | 2 +- .../apache/cloudstack/resource/NsxNetworkRule.java | 1 - .../apache/cloudstack/service/NsxApiClient.java | 12 +++++++++ .../org/apache/cloudstack/service/NsxElement.java | 3 ++- .../main/java/com/cloud/api/ApiResponseHelper.java | 7 +++++ .../configuration/ConfigurationManagerImpl.java | 31 +++++++++++++--------- .../java/com/cloud/network/NetworkServiceImpl.java | 2 +- .../cloud/network/router/CommandSetupHelper.java | 21 ++++++++++++--- .../cloud/network/router/NetworkHelperImpl.java | 4 +-- .../cloud/network/router/VpcNetworkHelperImpl.java | 8 ++++-- .../VpcVirtualNetworkApplianceManagerImpl.java | 8 +++++- .../cloud/vpc/MockConfigurationManagerImpl.java | 2 +- .../networkoffering/CreateNetworkOfferingTest.java | 3 +++ .../src/test/resources/createNetworkOffering.xml | 1 + ui/public/locales/en.json | 2 ++ ui/src/views/infra/zone/IpAddressRangeForm.vue | 20 +++++++++++++- ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 15 +++-------- .../infra/zone/ZoneWizardNetworkSetupStep.vue | 12 +++++++-- 23 files changed, 138 insertions(+), 44 deletions(-) diff --cc plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java index 8b108d0929a,534030a6211..1da9a82b424 --- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java +++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java @@@ -37,13 -33,6 +37,16 @@@ import com.vmware.nsx_policy.model.ApiE import com.vmware.nsx_policy.model.DhcpRelayConfig; import com.vmware.nsx_policy.model.EnforcementPointListResult; import com.vmware.nsx_policy.model.L4PortSetServiceEntry; ++<<<<<<< HEAD +import com.vmware.nsx_policy.model.LBAppProfileListResult; +import com.vmware.nsx_policy.model.LBPool; +import com.vmware.nsx_policy.model.LBPoolListResult; +import com.vmware.nsx_policy.model.LBPoolMember; +import com.vmware.nsx_policy.model.LBService; +import com.vmware.nsx_policy.model.LBVirtualServer; +import com.vmware.nsx_policy.model.LBVirtualServerListResult; ++======= ++>>>>>>> ce1659e8fcce61e0a6e7c75190af668f75172c87 import com.vmware.nsx_policy.model.LocaleServicesListResult; import com.vmware.nsx_policy.model.PolicyNatRule; import com.vmware.nsx_policy.model.Segment; @@@ -69,20 -56,10 +72,26 @@@ import org.apache.commons.collections.C import org.apache.log4j.Logger; import java.util.List; ++<<<<<<< HEAD +import java.util.Locale; import java.util.Objects; +import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; +import static org.apache.cloudstack.utils.NsxControllerUtils.getServerPoolMemberName; +import static org.apache.cloudstack.utils.NsxControllerUtils.getServerPoolName; +import static org.apache.cloudstack.utils.NsxControllerUtils.getServiceName; +import static org.apache.cloudstack.utils.NsxControllerUtils.getVirtualServerName; +import static org.apache.cloudstack.utils.NsxControllerUtils.getServiceEntryName; +import static org.apache.cloudstack.utils.NsxControllerUtils.getLoadBalancerName; +import static org.apache.cloudstack.utils.NsxControllerUtils.getLoadBalancerAlgorithm; ++======= ++import java.util.Objects; ++import java.util.function.Function; ++import java.util.stream.Collectors; ++>>>>>>> ce1659e8fcce61e0a6e7c75190af668f75172c87 + public class NsxApiClient { private final Function<Class<? extends Service>, Service> nsxService; @@@ -119,19 -96,6 +128,22 @@@ BYPASS } ++<<<<<<< HEAD + public enum LBAlgorithm { + ROUND_ROBIN, + LEAST_CONNECTION, + IP_HASH + } + + private enum LBSize { + SMALL, + MEDIUM, + LARGE, + XLARGE + } + ++======= ++>>>>>>> ce1659e8fcce61e0a6e7c75190af668f75172c87 public enum RouteAdvertisementType { TIER1_STATIC_ROUTES, TIER1_CONNECTED, TIER1_NAT, TIER1_LB_VIP, TIER1_LB_SNAT, TIER1_DNS_FORWARDER_IP, TIER1_IPSEC_LOCAL_ENDPOINT } diff --cc plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java index 2eb99fe5229,c8ac091485b..7f1fef855a1 --- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java +++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java @@@ -105,10 -98,9 +105,11 @@@ import java.util.Set import java.util.function.LongFunction; @Component --public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsServiceProvider, VpcProvider, - StaticNatServiceProvider, IpDeployer, PortForwardingServiceProvider, ResourceStateAdapter, Listener { ++public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsServiceProvider, VpcProvider, + StaticNatServiceProvider, IpDeployer, PortForwardingServiceProvider, + LoadBalancingServiceProvider, ResourceStateAdapter, Listener { + + @Inject AccountManager accountMgr; @Inject
