This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch nsx-vpc-routed-mode
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 36b1af05a9015785a2485b0c2ec13bf8a35658fe
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Tue Jan 23 18:51:36 2024 -0500
NSX: Fix VPC routed mode
---
.../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +-
server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java | 6 +++---
ui/src/views/network/VpcTiersTab.vue | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9e3a6db0a20..738f6be6560 100644
---
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -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();
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 17277b2f7dd..5f22e8470ef 100644
--- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -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));
}
/**
diff --git a/ui/src/views/network/VpcTiersTab.vue
b/ui/src/views/network/VpcTiersTab.vue
index 8bb84392bd3..5742cdf1341 100644
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@ -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) {
