This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch nsx-integration in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 318e785c97c0d1c03e7a47a2da62ba1c729e971f Author: Pearl Dsilva <[email protected]> AuthorDate: Thu Sep 7 16:53:20 2023 -0400 fix test / build failure --- .../src/main/java/com/cloud/configuration/ConfigurationManager.java | 3 ++- .../nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java | 4 ---- .../nsx/src/main/java/org/apache/cloudstack/service/NsxApi.java | 1 - .../nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java | 1 - .../main/java/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++-- server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java | 2 +- server/src/test/resources/createNetworkOffering.xml | 1 + 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java index 40b0c1f61fb..1146a33861d 100644 --- a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java +++ b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java @@ -214,6 +214,7 @@ public interface ConfigurationManager { * @param isPersistent ; * @param details TODO * @param forVpc + * @param forTungsten * @param forNsx * @param domainIds * @param zoneIds @@ -224,7 +225,7 @@ public interface ConfigurationManager { Integer networkRate, Map<Service, Set<Provider>> serviceProviderMap, boolean isDefault, Network.GuestType type, boolean systemOnly, Long serviceOfferingId, boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent, Map<NetworkOffering.Detail, String> details, boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive, Boolean forVpc, - Boolean forTungsten, boolean forNsx, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, final NetUtils.InternetProtocol internetProtocol); + Boolean forTungsten, Boolean forNsx, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, final NetUtils.InternetProtocol internetProtocol); Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, boolean forSystemVms, Long podId, String startIP, String endIP, String vlanGateway, String vlanNetmask, String vlanId, boolean bypassVlanOverlapCheck, Domain domain, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java index 65af6028ea7..d5b95e089d2 100644 --- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java +++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java @@ -27,18 +27,14 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.resource.ServerResource; import com.cloud.utils.exception.CloudRuntimeException; -import com.vmware.nsx.EdgeClusters; -import com.vmware.nsx.model.EdgeCluster; import com.vmware.nsx_policy.infra.Segments; import com.vmware.nsx_policy.infra.Tier1s; -import com.vmware.nsx_policy.infra.segments.ServiceSegments; import com.vmware.nsx_policy.infra.tier_0s.LocaleServices; import com.vmware.nsx_policy.model.ApiError; import com.vmware.nsx_policy.model.ChildLocaleServices; import com.vmware.nsx_policy.model.LocaleServicesListResult; import com.vmware.nsx_policy.model.Segment; import com.vmware.nsx_policy.model.SegmentSubnet; -import com.vmware.nsx_policy.model.ServiceSegmentListResult; import com.vmware.nsx_policy.model.Tier1; import com.vmware.vapi.bindings.Service; import com.vmware.vapi.std.errors.Error; diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApi.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApi.java index 6cb902e02e9..1d6b3e8867d 100644 --- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApi.java +++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApi.java @@ -17,7 +17,6 @@ package org.apache.cloudstack.service; import com.vmware.vapi.client.ApiClient; -import org.apache.log4j.Logger; public class NsxApi { diff --git 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 index 4da3a74eaf1..7e4c44e4778 100644 --- 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 @@ -74,7 +74,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.function.Function; import java.util.function.LongFunction; @Component diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index c9454dbc763..53fb73f6da5 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -6348,7 +6348,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati final Long serviceOfferingId, final boolean conserveMode, final Map<Service, Map<Capability, String>> serviceCapabilityMap, final boolean specifyIpRanges, final boolean isPersistent, final Map<Detail, String> details, final boolean egressDefaultPolicy, final Integer maxconn, final boolean enableKeepAlive, Boolean forVpc, - Boolean forTungsten, boolean forNsx, final List<Long> domainIds, final List<Long> zoneIds, final boolean enableOffering, final NetUtils.InternetProtocol internetProtocol) { + Boolean forTungsten, Boolean forNsx, final List<Long> domainIds, final List<Long> zoneIds, final boolean enableOffering, final NetUtils.InternetProtocol internetProtocol) { String servicePackageUuid; String spDescription = null; @@ -6509,7 +6509,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } offeringFinal.setForTungsten(Objects.requireNonNullElse(forTungsten, false)); - offeringFinal.setForNsx(Objects.requireNonNullElse(forTungsten, false)); + offeringFinal.setForNsx(Objects.requireNonNullElse(forNsx, false)); if (enableOffering) { offeringFinal.setState(NetworkOffering.State.Enabled); diff --git a/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java index 041d8c03dbe..935680108e9 100644 --- a/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -548,7 +548,7 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu Integer networkRate, Map<Service, Set<Provider>> serviceProviderMap, boolean isDefault, GuestType type, boolean systemOnly, Long serviceOfferingId, boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent, Map<NetworkOffering.Detail, String> details, boolean egressDefaultPolicy, Integer maxconn, boolean enableKeepAlive, Boolean forVpc, - Boolean forTungsten, boolean forNsx, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, NetUtils.InternetProtocol internetProtocol) { + Boolean forTungsten, Boolean forNsx, List<Long> domainIds, List<Long> zoneIds, boolean enableOffering, NetUtils.InternetProtocol internetProtocol) { // TODO Auto-generated method stub return null; } diff --git a/server/src/test/resources/createNetworkOffering.xml b/server/src/test/resources/createNetworkOffering.xml index 0f558d11a7a..b03c08e58eb 100644 --- a/server/src/test/resources/createNetworkOffering.xml +++ b/server/src/test/resources/createNetworkOffering.xml @@ -72,4 +72,5 @@ <bean id="PassphraseDaoImpl" class="org.apache.cloudstack.secret.dao.PassphraseDaoImpl" /> <bean id="configurationGroupDaoImpl" class="org.apache.cloudstack.framework.config.dao.ConfigurationGroupDaoImpl" /> <bean id="configurationSubGroupDaoImpl" class="org.apache.cloudstack.framework.config.dao.ConfigurationSubGroupDaoImpl" /> + <bean id="nsxControllerDaoImpl" class="com.cloud.network.dao.NsxProviderDaoImpl" /> </beans>
