From c3d62ecc12141466dc5de18dbe93e4ef5372e722 Mon Sep 17 00:00:00 2001
From: Gabriel P Santos <gabriel.santos@scclouds.com.br>
Date: Thu, 5 Sep 2024 10:42:47 -0300
Subject: [PATCH 1/6] pr

---
 .../apache/cloudstack/api/ApiConstants.java   |  1 +
 .../command/user/network/ListNetworksCmd.java |  2 +-
 .../api/response/IPAddressResponse.java       |  8 +++
 .../api/response/NetworkResponse.java         | 12 ++++
 .../java/com/cloud/api/ApiResponseHelper.java | 32 ++++++-----
 .../com/cloud/api/ApiResponseHelperTest.java  |  2 +-
 ui/src/components/view/InfoCard.vue           |  3 +-
 ui/src/components/view/ListView.vue           |  2 +-
 ui/src/views/network/IpAddressesTab.vue       | 55 ++++++++++++++++++-
 ui/src/views/network/VpcTiersTab.vue          | 30 +++++++++-
 10 files changed, 124 insertions(+), 23 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 2f0e4f16797d..e5b567d1aa91 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -829,6 +829,7 @@ public class ApiConstants {
     public static final String VPC_OFF_ID = "vpcofferingid";
     public static final String VPC_OFF_NAME = "vpcofferingname";
     public static final String NETWORK = "network";
+    public static final String VPC_ACCESS = "vpcaccess";
     public static final String VPC_ID = "vpcid";
     public static final String VPC_NAME = "vpcname";
     public static final String GATEWAY_ID = "gatewayid";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index 0e8425b14b4b..000ab48bb08f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -233,7 +233,7 @@ public void execute() {
     private void updateNetworkResponse(List<NetworkResponse> response) {
         for (NetworkResponse networkResponse : response) {
             ResourceIcon resourceIcon = resourceIconManager.getByResourceTypeAndUuid(ResourceTag.ResourceObjectType.Network, networkResponse.getId());
-            if (resourceIcon == null && networkResponse.getVpcId() != null) {
+            if (resourceIcon == null && networkResponse.getVpcId() != null && networkResponse.getVpcAccess()) {
                 resourceIcon = resourceIconManager.getByResourceTypeAndUuid(ResourceTag.ResourceObjectType.Vpc, networkResponse.getVpcId());
             }
             if (resourceIcon == null) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
index 0018edc86388..be0cdde17232 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
@@ -143,6 +143,10 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co
     @Param(description = "purpose of the IP address. In Acton this value is not null for Ips with isSystem=true, and can have either StaticNat or LB value")
     private String purpose;
 
+    @SerializedName(ApiConstants.VPC_ACCESS)
+    @Param(description = "Whether the calling account has access to this network's VPC", since = "4.20")
+    private boolean vpcAccess;
+
     @SerializedName(ApiConstants.VPC_ID)
     @Param(description = "VPC id the ip belongs to")
     private String vpcId;
@@ -297,6 +301,10 @@ public void setPurpose(String purpose) {
         this.purpose = purpose;
     }
 
+    public void setVpcAccess(boolean vpcAccess) {
+        this.vpcAccess = vpcAccess;
+    }
+
     public void setVpcId(String vpcId) {
         this.vpcId = vpcId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
index 1049740bf55a..5d3f713300d5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -191,6 +191,10 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
     @Param(description = "true if network supports specifying ip ranges, false otherwise")
     private Boolean specifyIpRanges;
 
+    @SerializedName(ApiConstants.VPC_ACCESS)
+    @Param(description = "Whether the calling account has access to this network's VPC", since = "4.20")
+    private boolean vpcAccess;
+
     @SerializedName(ApiConstants.VPC_ID)
     @Param(description = "VPC the network belongs to")
     private String vpcId;
@@ -491,6 +495,14 @@ public void setSpecifyIpRanges(Boolean specifyIpRanges) {
         this.specifyIpRanges = specifyIpRanges;
     }
 
+    public void setVpcAccess(boolean vpcAccess) {
+        this.vpcAccess = vpcAccess;
+    }
+
+    public boolean getVpcAccess() {
+        return vpcAccess;
+    }
+
     public void setVpcId(String vpcId) {
         this.vpcId = vpcId;
     }
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 01334c5d4c5a..75aa649e2ff2 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -1072,7 +1072,7 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip
         }
 
 
-        setVpcIdInResponse(ipAddr.getVpcId(), ipResponse::setVpcId, ipResponse::setVpcName);
+        setVpcIdInResponse(ipAddr.getVpcId(), ipResponse::setVpcId, ipResponse::setVpcName, ipResponse::setVpcAccess);
 
 
         // Network id the ip is associated with (if associated networkId is
@@ -1144,20 +1144,24 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip
         return ipResponse;
     }
 
+    private void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Consumer<String> vpcNameSetter, Consumer<Boolean> vpcAccessSetter) {
+        if (vpcId == null) {
+            return;
+        }
+        Vpc vpc = ApiDBUtils.findVpcById(vpcId);
+        if (vpc == null) {
+            return;
+        }
 
-    private void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Consumer<String> vpcNameSetter) {
-        if (vpcId != null) {
-            Vpc vpc = ApiDBUtils.findVpcById(vpcId);
-            if (vpc != null) {
-                try {
-                    _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, false, vpc);
-                    vpcUuidSetter.accept(vpc.getUuid());
-                } catch (PermissionDeniedException e) {
-                    logger.debug("Not setting the vpcId to the response because the caller does not have access to the VPC");
-                }
-                vpcNameSetter.accept(vpc.getName());
-            }
+        try {
+            _accountMgr.checkAccess(CallContext.current().getCallingAccount(), null, false, vpc);
+            vpcAccessSetter.accept(true);
+        } catch (PermissionDeniedException e) {
+            vpcAccessSetter.accept(false);
+            logger.debug("Setting [%s] as false because the caller does not have access to the VPC [%s].", ApiConstants.VPC_ACCESS, vpc);
         }
+        vpcNameSetter.accept(vpc.getName());
+        vpcUuidSetter.accept(vpc.getUuid());
     }
 
     private void showVmInfoForSharedNetworks(boolean forVirtualNetworks, IpAddress ipAddr, IPAddressResponse ipResponse) {
@@ -2657,7 +2661,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
         response.setSpecifyIpRanges(network.getSpecifyIpRanges());
 
 
-        setVpcIdInResponse(network.getVpcId(), response::setVpcId, response::setVpcName);
+        setVpcIdInResponse(network.getVpcId(), response::setVpcId, response::setVpcName, response::setVpcAccess);
 
         setResponseAssociatedNetworkInformation(response, network.getId());
 
diff --git a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
index a68623aa1443..aef53dd4261c 100644
--- a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
+++ b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
@@ -202,7 +202,7 @@ public void testUsageRecordResponse(){
     public void setResponseIpAddressTestIpv4() {
         NicSecondaryIp result = Mockito.mock(NicSecondaryIp.class);
         NicSecondaryIpResponse response = new NicSecondaryIpResponse();
-        setResult(result, "ipv4", "ipv6");
+        setResult(result, "ipv4", "");
 
         ApiResponseHelper.setResponseIpAddress(result, response);
 
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 24b7cce0feb2..ed1a8016a6b2 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -489,7 +489,8 @@
               <resource-icon :image="getImage(images.vpc)" size="1x" style="margin-right: 5px"/>
             </span>
             <deployment-unit-outlined v-else />
-            <router-link :to="{ path: '/vpc/' + resource.vpcid }">{{ resource.vpcname || resource.vpcid }}</router-link>
+            <router-link v-if="resource.vpcaccess" :to="{ path: '/vpc/' + resource.vpcid }">{{ resource.vpcname || resource.vpcid }}</router-link>
+            <span v-else>{{ resource.vpcname || resource.vpcid }}</span>
           </div>
         </div>
 
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 2f94d6436a40..2b354dfdbd1d 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -270,7 +270,7 @@
         <router-link :to="{ path: '/guestnetwork/' + record.associatednetworkid }">{{ text }}</router-link>
       </template>
       <template v-if="column.key === 'vpcname'">
-        <a v-if="record.vpcid">
+        <a v-if="record.vpcid && record.vpcaccess">
           <router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text || record.vpcid }}</router-link>
         </a>
         <span v-else>{{ text }}</span>
diff --git a/ui/src/views/network/IpAddressesTab.vue b/ui/src/views/network/IpAddressesTab.vue
index 37b5b210a96f..354ada15c962 100644
--- a/ui/src/views/network/IpAddressesTab.vue
+++ b/ui/src/views/network/IpAddressesTab.vue
@@ -145,7 +145,9 @@
       centered
       width="450px">
       <a-spin :spinning="acquireLoading" v-ctrl-enter="acquireIpAddress">
-        <a-alert :message="$t('message.action.acquire.ip')" type="warning" />
+        <div v-if="$route.path.startsWith('/vpc') && !isNormalUserOrProject()">
+          <ownership-selection :override="possibleOwnership" @fetch-owner="fetchOwnerOptions"/>
+        </div>
         <a-form layout="vertical" style="margin-top: 10px">
           <a-form-item :label="$t('label.ipaddress')">
             <a-select
@@ -162,6 +164,7 @@
                 :key="ip.ipaddress"
                 :label="ip.ipaddress + '(' + ip.state + ')'">{{ ip.ipaddress }} ({{ ip.state }})</a-select-option>
             </a-select>
+          <a-alert :message="$t('message.action.acquire.ip')" type="warning" />
           </a-form-item>
           <div :span="24" class="action-button">
             <a-button @click="onCloseModal">{{ $t('label.cancel') }}</a-button>
@@ -212,10 +215,12 @@ import Status from '@/components/widgets/Status'
 import TooltipButton from '@/components/widgets/TooltipButton'
 import BulkActionView from '@/components/view/BulkActionView'
 import eventBus from '@/config/eventBus'
+import OwnershipSelection from '@/views/compute/wizard/OwnershipSelection.vue'
 
 export default {
   name: 'IpAddressesTab',
   components: {
+    OwnershipSelection,
     Status,
     TooltipButton,
     BulkActionView
@@ -282,6 +287,11 @@ export default {
       acquireLoading: false,
       acquireIp: null,
       listPublicIpAddress: [],
+      possibleOwnership: {
+        domains: null,
+        projects: null,
+        accounts: null
+      },
       changeSourceNat: false
     }
   },
@@ -301,6 +311,9 @@ export default {
   },
   inject: ['parentFetchData'],
   methods: {
+    isNormalUserOrProject () {
+      return ['User'].includes(this.$store.getters.userInfo.roletype) || this.$store.getters.project?.id
+    },
     fetchData () {
       const params = {
         listall: true,
@@ -344,6 +357,21 @@ export default {
         }).catch(reject)
       })
     },
+    fetchOwnerOptions (OwnerOptions) {
+      this.owner = {}
+      if (OwnerOptions.selectedAccountType === this.$t('label.account')) {
+        if (!OwnerOptions.selectedAccount) {
+          return
+        }
+        this.owner.account = OwnerOptions.selectedAccount
+        this.owner.domainid = OwnerOptions.selectedDomain
+      } else if (OwnerOptions.selectedAccountType === this.$t('label.project')) {
+        if (!OwnerOptions.selectedProject) {
+          return
+        }
+        this.owner.projectid = OwnerOptions.selectedProject
+      }
+    },
     handleTierSelect (tier) {
       this.vpcTier = tier
       this.fetchData()
@@ -427,8 +455,10 @@ export default {
       const params = {}
       if (this.$route.path.startsWith('/vpc')) {
         params.vpcid = this.resource.id
-        if (this.vpcTier) {
-          params.networkid = this.vpcTier
+        if (this.owner) {
+          params.domainid = this.owner.domainid
+          params.account = this.owner.projectid ? null : this.owner.account
+          params.projectid = this.owner.projectid ? this.owner.projectid : null
         }
       } else {
         params.networkid = this.resource.id
@@ -534,12 +564,31 @@ export default {
         default: return '/vm/'
       }
     },
+    getAvailableOwnersForIP () {
+      if (!this.$route.path.startsWith('/vpc')) {
+        return
+      }
+
+      this.possibleOwnership.domains = new Set([this.resource.domainid])
+      this.possibleOwnership.projects = this.resource.projectid ? new Set([this.resource.projectid]) : new Set([])
+      this.possibleOwnership.accounts = this.resource.projectid ? new Set([]) : new Set([this.resource.account])
+
+      this.resource.network.forEach(network => {
+        this.possibleOwnership.domains.add(network.domainid)
+        if (network.projectid) {
+          this.possibleOwnership.projects.add(network.projectid)
+        } else {
+          this.possibleOwnership.accounts.add(network.account)
+        }
+      })
+    },
     async onShowAcquireIp () {
       this.showAcquireIp = true
       this.acquireLoading = true
       this.listPublicIpAddress = []
 
       try {
+        this.getAvailableOwnersForIP()
         const listPublicIpAddress = await this.fetchListPublicIpAddress()
         listPublicIpAddress.forEach(item => {
           if (item.state === 'Free' || item.state === 'Reserved') {
diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue
index ddfd8fe0e8d2..403cf8225fc2 100644
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@ -166,6 +166,9 @@
       :footer="null"
       @cancel="showCreateNetworkModal = false">
       <a-spin :spinning="modalLoading" v-ctrl-enter="handleAddNetworkSubmit">
+        <div v-if="!isNormalUserOrProject()">
+          <ownership-selection @fetch-owner="fetchOwnerOptions"/>
+        </div>
         <a-form
           layout="vertical"
           :ref="formRef"
@@ -344,11 +347,13 @@ import { api } from '@/api'
 import { mixinForm } from '@/utils/mixin'
 import Status from '@/components/widgets/Status'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import OwnershipSelection from '@/views/compute/wizard/OwnershipSelection.vue'
 
 export default {
   name: 'VpcTiersTab',
   mixins: [mixinForm],
   components: {
+    OwnershipSelection,
     Status,
     TooltipLabel
   },
@@ -457,6 +462,9 @@ export default {
     isObjectEmpty (obj) {
       return !(obj !== null && obj !== undefined && Object.keys(obj).length > 0 && obj.constructor === Object)
     },
+    isNormalUserOrProject () {
+      return ['User'].includes(this.$store.getters.userInfo.roletype) || this.$store.getters.project?.id
+    },
     initForm () {
       this.formRef = ref()
       this.form = reactive({})
@@ -487,6 +495,23 @@ export default {
       }
       this.publicLBNetworkExists()
     },
+    fetchOwnerOptions (OwnerOptions) {
+      this.owner = {}
+      if (OwnerOptions.selectedAccountType === this.$t('label.account')) {
+        if (!OwnerOptions.selectedAccount) {
+          this.owner = undefined
+          return
+        }
+        this.owner.account = OwnerOptions.selectedAccount
+        this.owner.domainid = OwnerOptions.selectedDomain
+      } else if (OwnerOptions.selectedAccountType === this.$t('label.project')) {
+        if (!OwnerOptions.selectedProject) {
+          this.owner = undefined
+          return
+        }
+        this.owner.projectid = OwnerOptions.selectedProject
+      }
+    },
     fetchMtuForZone () {
       api('listZones', {
         id: this.resource.zoneid
@@ -679,8 +704,9 @@ export default {
         this.showCreateNetworkModal = false
         var params = {
           vpcid: this.resource.id,
-          domainid: this.resource.domainid,
-          account: this.resource.account,
+          domainid: this.owner?.domainid ? this.owner.domainid : this.resource.domainid,
+          account: this.owner?.projectid ? null : (this.owner?.account ? this.owner.account : this.resource.account),
+          projectid: this.owner?.projectid ? this.owner.projectid : null,
           networkOfferingId: values.networkOffering,
           name: values.name,
           displayText: values.name,

From ffa6af3196d1eddc519126a3df6e7e61a37d816e Mon Sep 17 00:00:00 2001
From: Gabriel P Santos <gabriel.santos@scclouds.com.br>
Date: Fri, 6 Sep 2024 17:02:40 -0300
Subject: [PATCH 2/6] add tier's account to listing

---
 ui/src/views/network/VpcTiersTab.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue
index 403cf8225fc2..3fed615e8eb8 100644
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@ -58,6 +58,16 @@
                 </router-link>
               </div>
             </div>
+            <div class="list__col" v-if="!(resource.domainid === network.domainid && resource.account === network.account)">
+              <div class="list__label">
+                {{ $t('label.account') }}
+              </div>
+              <div>
+                <router-link :to="{ path: '/account', query: { name: network.account, domainid: network.domainid, dataView: true } }">
+                  {{ network.account }}
+                </router-link>
+              </div>
+            </div>
           </div>
           <a-collapse :bordered="false" style="margin-left: -18px">
             <template #expandIcon="props">

From f4984292fa834475f6c59a5e7e7e29be893c7a8e Mon Sep 17 00:00:00 2001
From: Gabriel P Santos <gabriel.santos@scclouds.com.br>
Date: Mon, 9 Sep 2024 17:05:13 -0300
Subject: [PATCH 3/6] add acl response check

---
 .../java/com/cloud/api/ApiResponseHelper.java | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 75aa649e2ff2..8233138c5354 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -1164,6 +1164,25 @@ private void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Cons
         vpcUuidSetter.accept(vpc.getUuid());
     }
 
+    private void setAclIdInResponse(Network network, NetworkResponse response) {
+        if (network.getNetworkACLId() == null) {
+            return;
+        }
+
+        NetworkACL acl = ApiDBUtils.findByNetworkACLId(network.getNetworkACLId());
+        if (acl == null) {
+            return;
+        }
+
+        if (!response.getVpcAccess() && acl.getVpcId() != 0) {
+            logger.debug("[{}] not set in response, since caller does not have access to it.", acl);
+            return;
+        }
+
+        response.setAclId(acl.getUuid());
+        response.setAclName(acl.getName());
+    }
+
     private void showVmInfoForSharedNetworks(boolean forVirtualNetworks, IpAddress ipAddr, IPAddressResponse ipResponse) {
         if (!forVirtualNetworks) {
             NicVO nic = ApiDBUtils.findByIp4AddressAndNetworkId(ipAddr.getAddress().toString(), ipAddr.getNetworkId());
@@ -2662,6 +2681,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
 
 
         setVpcIdInResponse(network.getVpcId(), response::setVpcId, response::setVpcName, response::setVpcAccess);
+        setAclIdInResponse(network, response);
 
         setResponseAssociatedNetworkInformation(response, network.getId());
 
@@ -2678,14 +2698,6 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
         response.setHasAnnotation(annotationDao.hasAnnotations(network.getUuid(), AnnotationService.EntityType.NETWORK.name(),
                 _accountMgr.isRootAdmin(CallContext.current().getCallingAccount().getId())));
 
-        if (network.getNetworkACLId() != null) {
-            NetworkACL acl = ApiDBUtils.findByNetworkACLId(network.getNetworkACLId());
-            if (acl != null) {
-                response.setAclId(acl.getUuid());
-                response.setAclName(acl.getName());
-            }
-        }
-
         response.setStrechedL2Subnet(network.isStrechedL2Network());
         if (network.isStrechedL2Network()) {
             Set<String> networkSpannedZones = new  HashSet<String>();

From b9d656baf12310facdbeb3d63cab638aaac5ed03 Mon Sep 17 00:00:00 2001
From: Gabriel P Santos <gabriel.santos@scclouds.com.br>
Date: Mon, 16 Sep 2024 14:19:02 -0300
Subject: [PATCH 4/6] cleanup random change

---
 server/src/test/java/com/cloud/api/ApiResponseHelperTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
index aef53dd4261c..a68623aa1443 100644
--- a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
+++ b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
@@ -202,7 +202,7 @@ public void testUsageRecordResponse(){
     public void setResponseIpAddressTestIpv4() {
         NicSecondaryIp result = Mockito.mock(NicSecondaryIp.class);
         NicSecondaryIpResponse response = new NicSecondaryIpResponse();
-        setResult(result, "ipv4", "");
+        setResult(result, "ipv4", "ipv6");
 
         ApiResponseHelper.setResponseIpAddress(result, response);
 

From 147a53469e6d506920c068313ef388ce4511550a Mon Sep 17 00:00:00 2001
From: Gabriel P Santos <gabriel.santos@scclouds.com.br>
Date: Wed, 18 Sep 2024 12:01:12 -0300
Subject: [PATCH 5/6] add tests

---
 .../api/response/NetworkResponse.java         |   4 +-
 .../java/com/cloud/api/ApiResponseHelper.java |   6 +-
 .../com/cloud/api/ApiResponseHelperTest.java  | 147 ++++++++++++++++++
 3 files changed, 152 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
index 5d3f713300d5..ef4c4ccc00ac 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -193,7 +193,7 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
 
     @SerializedName(ApiConstants.VPC_ACCESS)
     @Param(description = "Whether the calling account has access to this network's VPC", since = "4.20")
-    private boolean vpcAccess;
+    private Boolean vpcAccess;
 
     @SerializedName(ApiConstants.VPC_ID)
     @Param(description = "VPC the network belongs to")
@@ -499,7 +499,7 @@ public void setVpcAccess(boolean vpcAccess) {
         this.vpcAccess = vpcAccess;
     }
 
-    public boolean getVpcAccess() {
+    public Boolean getVpcAccess() {
         return vpcAccess;
     }
 
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 8233138c5354..d752f9ad4d41 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -1144,7 +1144,7 @@ public IPAddressResponse createIPAddressResponse(ResponseView view, IpAddress ip
         return ipResponse;
     }
 
-    private void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Consumer<String> vpcNameSetter, Consumer<Boolean> vpcAccessSetter) {
+    protected void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Consumer<String> vpcNameSetter, Consumer<Boolean> vpcAccessSetter) {
         if (vpcId == null) {
             return;
         }
@@ -1164,7 +1164,7 @@ private void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Cons
         vpcUuidSetter.accept(vpc.getUuid());
     }
 
-    private void setAclIdInResponse(Network network, NetworkResponse response) {
+    protected void setAclIdInResponse(Network network, NetworkResponse response) {
         if (network.getNetworkACLId() == null) {
             return;
         }
@@ -1174,7 +1174,7 @@ private void setAclIdInResponse(Network network, NetworkResponse response) {
             return;
         }
 
-        if (!response.getVpcAccess() && acl.getVpcId() != 0) {
+        if (Boolean.FALSE.equals(response.getVpcAccess()) && acl.getVpcId() != 0) {
             logger.debug("[{}] not set in response, since caller does not have access to it.", acl);
             return;
         }
diff --git a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
index a68623aa1443..1c54f51e499d 100644
--- a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
+++ b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
@@ -19,6 +19,8 @@
 import com.cloud.capacity.Capacity;
 import com.cloud.configuration.Resource;
 import com.cloud.domain.DomainVO;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.network.Network;
 import com.cloud.network.PublicIpQuarantine;
 import com.cloud.network.as.AutoScaleVmGroup;
 import com.cloud.network.as.AutoScaleVmGroupVO;
@@ -29,6 +31,8 @@
 import com.cloud.network.dao.LoadBalancerVO;
 import com.cloud.network.dao.NetworkServiceMapDao;
 import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.vpc.NetworkACL;
+import com.cloud.network.vpc.VpcVO;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.usage.UsageVO;
 import com.cloud.user.Account;
@@ -46,6 +50,7 @@
 import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
 import org.apache.cloudstack.api.response.DirectDownloadCertificateResponse;
 import org.apache.cloudstack.api.response.IpQuarantineResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
 import org.apache.cloudstack.api.response.UnmanagedInstanceResponse;
 import org.apache.cloudstack.api.response.UsageRecordResponse;
@@ -105,6 +110,13 @@ public class ApiResponseHelperTest {
     @Mock
     IPAddressDao ipAddressDaoMock;
 
+    @Mock
+    VpcVO vpcVOMock;
+
+    @Mock
+    NetworkACL networkACLMock;
+
+
     @Spy
     @InjectMocks
     ApiResponseHelper apiResponseHelper = new ApiResponseHelper();
@@ -123,6 +135,9 @@ public class ApiResponseHelperTest {
 
     static long autoScaleUserId = 7L;
 
+    static final String A_NAME = "name";
+    static final String A_UUID = "021f94d4-73f9-4a9a-b003-1df9dd968a09";
+
     @Before
     public void injectMocks() throws SecurityException, NoSuchFieldException,
             IllegalArgumentException, IllegalAccessException {
@@ -481,4 +496,136 @@ public void testCapacityListingForSingleNonGpuType() {
         Assert.assertTrue(apiResponseHelper.capacityListingForSingleNonGpuType(List.of(c1, c2)));
         Assert.assertFalse(apiResponseHelper.capacityListingForSingleNonGpuType(List.of(c1, c2, c3)));
     }
+
+    @Test
+    public void setVpcIdInResponseTestNullVpcIdReturnNull() {
+        NetworkResponse networkResponse = new NetworkResponse();
+
+        apiResponseHelper.setVpcIdInResponse(null, networkResponse::setVpcId, networkResponse::setVpcName, networkResponse::setVpcAccess);
+        Assert.assertNull(networkResponse.getVpcId());
+        Assert.assertNull(networkResponse.getVpcName());
+        Assert.assertNull(networkResponse.getVpcAccess());
+    }
+
+    @Test
+    public void setVpcIdInResponseTestNullVpcReturnNull() {
+        NetworkResponse networkResponse = new NetworkResponse();
+
+        try (MockedStatic<ApiDBUtils> utils = Mockito.mockStatic(ApiDBUtils.class)) {
+            utils.when(() -> ApiDBUtils.findVpcById(1L)).thenReturn(null);
+            apiResponseHelper.setVpcIdInResponse(1L, networkResponse::setVpcId, networkResponse::setVpcName, networkResponse::setVpcAccess);
+        }
+        Assert.assertNull(networkResponse.getVpcId());
+        Assert.assertNull(networkResponse.getVpcName());
+        Assert.assertNull(networkResponse.getVpcAccess());
+    }
+
+    @Test
+    public void setVpcIdInResponseCallerHasAccessReturnVpcAccessTrueAndVpcIdAndVpcName() {
+        NetworkResponse networkResponse = new NetworkResponse();
+        Mockito.when(vpcVOMock.getName()).thenReturn(A_NAME);
+        Mockito.when(vpcVOMock.getUuid()).thenReturn(A_UUID);
+
+        try (MockedStatic<ApiDBUtils> utils = Mockito.mockStatic(ApiDBUtils.class)) {
+            utils.when(() -> ApiDBUtils.findVpcById(1L)).thenReturn(vpcVOMock);
+            apiResponseHelper.setVpcIdInResponse(1L, networkResponse::setVpcId, networkResponse::setVpcName, networkResponse::setVpcAccess);
+        };
+        Assert.assertEquals(A_UUID, networkResponse.getVpcId());
+        Assert.assertEquals(A_NAME, networkResponse.getVpcName());
+        Assert.assertTrue(networkResponse.getVpcAccess());
+    }
+
+    @Test
+    public void setVpcIdInResponseCallerDoesNotHaveAccessReturnVpcAccessFalseAndVpcIdAndVpcName() {
+        NetworkResponse networkResponse = new NetworkResponse();
+        Mockito.when(vpcVOMock.getName()).thenReturn(A_NAME);
+        Mockito.when(vpcVOMock.getUuid()).thenReturn(A_UUID);
+
+        try (MockedStatic<ApiDBUtils> utils = Mockito.mockStatic(ApiDBUtils.class)) {
+            utils.when(() -> ApiDBUtils.findVpcById(1L)).thenReturn(vpcVOMock);
+            Mockito.doThrow(PermissionDeniedException.class).when(accountManagerMock).checkAccess(Mockito.any(), Mockito.any(), Mockito.anyBoolean(), Mockito.any());
+            apiResponseHelper.setVpcIdInResponse(1L, networkResponse::setVpcId, networkResponse::setVpcName, networkResponse::setVpcAccess);
+        };
+        Assert.assertEquals(A_UUID, networkResponse.getVpcId());
+        Assert.assertEquals(A_NAME, networkResponse.getVpcName());
+        Assert.assertFalse(networkResponse.getVpcAccess());
+    }
+
+    @Test
+    public void setAclIdInResponseTestNullNetworkAclIdReturnNull() {
+        NetworkResponse networkResponse = new NetworkResponse();
+        Network networkMock = Mockito.mock(Network.class);
+        Mockito.when(networkMock.getNetworkACLId()).thenReturn(null);
+
+        apiResponseHelper.setAclIdInResponse(networkMock, networkResponse);
+        Assert.assertNull(networkResponse.getAclId());
+        Assert.assertNull(networkResponse.getAclName());
+    }
+
+    @Test
+    public void setAclIdInResponseTestNullAclReturnNull() {
+        NetworkResponse networkResponse = new NetworkResponse();
+        Network networkMock = Mockito.mock(Network.class);
+        Mockito.when(networkMock.getNetworkACLId()).thenReturn(1L);
+
+        try (MockedStatic<ApiDBUtils> utils = Mockito.mockStatic(ApiDBUtils.class)) {
+            utils.when(() -> ApiDBUtils.findByNetworkACLId(1L)).thenReturn(null);
+            apiResponseHelper.setAclIdInResponse(networkMock, networkResponse);
+        }
+        Assert.assertNull(networkResponse.getAclId());
+        Assert.assertNull(networkResponse.getAclName());
+    }
+
+    @Test
+    public void setAclIdInResponseTestCallerDoesNotHaveAccessReturnNull() {
+        NetworkResponse networkResponse = new NetworkResponse();
+        networkResponse.setVpcAccess(false);
+        Network networkMock = Mockito.mock(Network.class);
+        Mockito.when(networkMock.getNetworkACLId()).thenReturn(1L);
+        Mockito.when(networkACLMock.getVpcId()).thenReturn(2L);
+
+        try (MockedStatic<ApiDBUtils> utils = Mockito.mockStatic(ApiDBUtils.class)) {
+            utils.when(() -> ApiDBUtils.findByNetworkACLId(1L)).thenReturn(networkACLMock);
+            apiResponseHelper.setAclIdInResponse(networkMock, networkResponse);
+        }
+        Assert.assertNull(networkResponse.getAclId());
+        Assert.assertNull(networkResponse.getAclName());
+    }
+
+    @Test
+    public void setAclIdInResponseTestCallerDoesNotHaveAccessButAclIsGlobalReturnAclIdAndAclName() {
+        NetworkResponse networkResponse = new NetworkResponse();
+        networkResponse.setVpcAccess(false);
+        Network networkMock = Mockito.mock(Network.class);
+        Mockito.when(networkMock.getNetworkACLId()).thenReturn(1L);
+        Mockito.when(networkACLMock.getVpcId()).thenReturn(0L);
+        Mockito.when(networkACLMock.getName()).thenReturn(A_NAME);
+        Mockito.when(networkACLMock.getUuid()).thenReturn(A_UUID);
+
+        try (MockedStatic<ApiDBUtils> utils = Mockito.mockStatic(ApiDBUtils.class)) {
+            utils.when(() -> ApiDBUtils.findByNetworkACLId(1L)).thenReturn(networkACLMock);
+            apiResponseHelper.setAclIdInResponse(networkMock, networkResponse);
+        }
+        Assert.assertEquals(A_UUID, networkResponse.getAclId());
+        Assert.assertEquals(A_NAME, networkResponse.getAclName());
+    }
+
+    @Test
+    public void setAclIdInResponseTestCallerHasAccessReturnAclIdAndAclName() {
+        NetworkResponse networkResponse = new NetworkResponse();
+        networkResponse.setVpcAccess(true);
+        Network networkMock = Mockito.mock(Network.class);
+        Mockito.when(networkMock.getNetworkACLId()).thenReturn(1L);
+        Mockito.lenient().when(networkACLMock.getVpcId()).thenReturn(2L);
+        Mockito.when(networkACLMock.getName()).thenReturn(A_NAME);
+        Mockito.when(networkACLMock.getUuid()).thenReturn(A_UUID);
+
+        try (MockedStatic<ApiDBUtils> utils = Mockito.mockStatic(ApiDBUtils.class)) {
+            utils.when(() -> ApiDBUtils.findByNetworkACLId(1L)).thenReturn(networkACLMock);
+            apiResponseHelper.setAclIdInResponse(networkMock, networkResponse);
+        }
+        Assert.assertEquals(A_UUID, networkResponse.getAclId());
+        Assert.assertEquals(A_NAME, networkResponse.getAclName());
+    }
+
 }

From 68a3bfe4527f182434afb1c5dfd094d49199efbc Mon Sep 17 00:00:00 2001
From: Gabriel Pordeus Santos <gabrielpordeus@gmail.com>
Date: Mon, 3 Mar 2025 17:04:25 -0300
Subject: [PATCH 6/6] Apply suggestions from code review

Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com>
---
 .../org/apache/cloudstack/api/response/IPAddressResponse.java | 2 +-
 .../org/apache/cloudstack/api/response/NetworkResponse.java   | 2 +-
 server/src/main/java/com/cloud/api/ApiResponseHelper.java     | 2 +-
 ui/src/views/network/IpAddressesTab.vue                       | 2 +-
 ui/src/views/network/VpcTiersTab.vue                          | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
index be0cdde17232..06811bf7f8f4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java
@@ -144,7 +144,7 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co
     private String purpose;
 
     @SerializedName(ApiConstants.VPC_ACCESS)
-    @Param(description = "Whether the calling account has access to this network's VPC", since = "4.20")
+    @Param(description = "Whether the calling account has access to this network's VPC", since = "4.21.0")
     private boolean vpcAccess;
 
     @SerializedName(ApiConstants.VPC_ID)
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
index ef4c4ccc00ac..df52ea43011a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
@@ -192,7 +192,7 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
     private Boolean specifyIpRanges;
 
     @SerializedName(ApiConstants.VPC_ACCESS)
-    @Param(description = "Whether the calling account has access to this network's VPC", since = "4.20")
+    @Param(description = "Whether the calling account has access to this network's VPC", since = "4.21.0")
     private Boolean vpcAccess;
 
     @SerializedName(ApiConstants.VPC_ID)
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index d752f9ad4d41..b278616483e2 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -1158,7 +1158,7 @@ protected void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Co
             vpcAccessSetter.accept(true);
         } catch (PermissionDeniedException e) {
             vpcAccessSetter.accept(false);
-            logger.debug("Setting [%s] as false because the caller does not have access to the VPC [%s].", ApiConstants.VPC_ACCESS, vpc);
+            logger.debug("Setting [{}] as false because the caller does not have access to the VPC [{}].", ApiConstants.VPC_ACCESS, vpc);
         }
         vpcNameSetter.accept(vpc.getName());
         vpcUuidSetter.accept(vpc.getUuid());
diff --git a/ui/src/views/network/IpAddressesTab.vue b/ui/src/views/network/IpAddressesTab.vue
index 354ada15c962..9af17920bc93 100644
--- a/ui/src/views/network/IpAddressesTab.vue
+++ b/ui/src/views/network/IpAddressesTab.vue
@@ -458,7 +458,7 @@ export default {
         if (this.owner) {
           params.domainid = this.owner.domainid
           params.account = this.owner.projectid ? null : this.owner.account
-          params.projectid = this.owner.projectid ? this.owner.projectid : null
+          params.projectid = this.owner.projectid || null
         }
       } else {
         params.networkid = this.resource.id
diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue
index 3fed615e8eb8..d352a846d60d 100644
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@ -714,9 +714,9 @@ export default {
         this.showCreateNetworkModal = false
         var params = {
           vpcid: this.resource.id,
-          domainid: this.owner?.domainid ? this.owner.domainid : this.resource.domainid,
+          domainid: this.owner?.domainid || this.resource.domainid,
           account: this.owner?.projectid ? null : (this.owner?.account ? this.owner.account : this.resource.account),
-          projectid: this.owner?.projectid ? this.owner.projectid : null,
+          projectid: this.owner?.projectid || null,
           networkOfferingId: values.networkOffering,
           name: values.name,
           displayText: values.name,