apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

NSX: Fix VPC routed mode

Browse Source
This commit is contained in:
Pearl Dsilva 2024-01-23 18:51:36 -05:00
parent 80365c8333
commit 588bf63da2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -941,7 +941,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
* @return ordered list of Network and NicProfile pair
* @param networks the map od networks to nic profiles list
*/
private List<Pair<Network, NicProfile>> getOrderedNetworkNicProfileMapping(final LinkedHashMap<? extends Network, List<? extends NicProfile>> networks) {
private List<Pair<Network, NicProfile>> getOrderedNetworkNicProfileMapping(final LinkedHashMap<? extends Network, List<? extends NicProfile>> networks) {
List<Pair<Network, NicProfile>> profilesList = new ArrayList<>();
for (final Map.Entry<? extends Network, List<? extends NicProfile>> network : networks.entrySet()) {
List<? extends NicProfile> requestedProfiles = network.getValue();

6
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -403,7 +403,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
if (List.of(Service.UserData, Service.Dhcp, Service.Dns).contains(svc)) {
final Set<Provider> userDataProvider = Set.of(Provider.VPCVirtualRouter);
svcProviderMap.put(svc, userDataProvider);
} else {
} else if (Service.NetworkACL.equals(svc)){
svcProviderMap.put(svc, defaultProviders);
}
}
@ -3189,8 +3189,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
@Override
public boolean isSrcNatIpRequired(long vpcOfferingId) {
final Map<Network.Service, Set<Network.Provider>> vpcOffSvcProvidersMap = getVpcOffSvcProvidersMap(vpcOfferingId);
return vpcOffSvcProvidersMap.get(Network.Service.SourceNat).contains(Network.Provider.VPCVirtualRouter) ||
vpcOffSvcProvidersMap.get(Service.SourceNat).contains(Provider.Nsx);
return Objects.nonNull(vpcOffSvcProvidersMap.get(Network.Service.SourceNat)) && (vpcOffSvcProvidersMap.get(Network.Service.SourceNat).contains(Network.Provider.VPCVirtualRouter) ||
vpcOffSvcProvidersMap.get(Service.SourceNat).contains(Provider.Nsx));
}
/**

6
ui/src/views/network/VpcTiersTab.vue
View File

@ -461,8 +461,14 @@ export default {
this.form = reactive({})
this.rules = reactive({})
},
<<<<<<< Updated upstream
showIlb (network) {
return network.service.filter(s => (s.name === 'Lb') && (s.capability.filter(c => c.name === 'LbSchemes' && c.value === 'Internal').length > 0)).length > 0 || false
=======
async showIlb (network) {
const networkOffering = await this.getNetworkOffering(network.networkofferingid)
return ((networkOffering.supportsinternallb && network.service.filter(s => (s.name === 'Lb') && (s.capability.filter(c => c.name === 'LbSchemes' && c.value.split(',').includes('Internal')).length > 0)).length > 0))
>>>>>>> Stashed changes
},
updateMtu () {
if (this.form.privatemtu > this.privateMtuMax) {