(cloudstack) 05/06: NSX: Add shared network support (#41)

[pearl11594]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch nsx-integration-fixes
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 968235af18344fd12332b3743176ce22351bfaf7
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Wed Apr 10 10:10:00 2024 -0400

    NSX: Add shared network support (#41)
---
 .../src/main/java/com/cloud/network/NetworkServiceImpl.java   |  2 +-
 ui/src/views/network/CreateSharedNetworkForm.vue              | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java 
b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index 6168de1ef63..2afa16a06d3 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -1749,7 +1749,7 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
 
     private void validateNetworkCreationSupported(long zoneId, String 
zoneName, GuestType guestType) {
         NsxProviderVO nsxProviderVO = nsxProviderDao.findByZoneId(zoneId);
-        if (Objects.nonNull(nsxProviderVO) && List.of(GuestType.L2, 
GuestType.Shared).contains(guestType)) {
+        if (Objects.nonNull(nsxProviderVO) && 
List.of(GuestType.L2).contains(guestType)) {
             throw new InvalidParameterValueException(
                     String.format("Creation of %s networks is not supported in 
NSX enabled zone %s", guestType.name(), zoneName)
             );
diff --git a/ui/src/views/network/CreateSharedNetworkForm.vue 
b/ui/src/views/network/CreateSharedNetworkForm.vue
index 4fd42370946..b0c7203f833 100644
--- a/ui/src/views/network/CreateSharedNetworkForm.vue
+++ b/ui/src/views/network/CreateSharedNetworkForm.vue
@@ -18,14 +18,7 @@
 <template>
   <a-spin :spinning="loading">
     <div class="form-layout" v-ctrl-enter="handleSubmit">
-      <div v-if="isNsxEnabled">
-        <a-alert type="warning">
-          <template #message>
-            <span v-html="$t('message.shared.network.unsupported.for.nsx')" />
-          </template>
-        </a-alert>
-      </div>
-      <div v-else class="form">
+      <div class="form">
         <a-form
           :ref="formRef"
           :model="form"
@@ -725,7 +718,7 @@ export default {
           var trafficTypes = json.listtraffictypesresponse.traffictype
           if (this.arrayHasItems(trafficTypes)) {
             for (const type of trafficTypes) {
-              if (type.traffictype === 'Guest') {
+              if (type.traffictype === 'Guest' && 
physicalNetwork.isolationmethods !== 'NSX') {
                 this.formPhysicalNetworks.push(physicalNetwork)
                 break
               }