Merge remote-tracking branch 'apache/4.19'

api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupResponse.java

@@ -56,6 +56,10 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie
     @Param(description = "the domain name of the affinity group")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the affinity group belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.PROJECT_ID)
     @Param(description = "the project ID of the affinity group")
     private String projectId;
@@ -115,6 +119,11 @@ public class AffinityGroupResponse extends BaseResponse implements ControlledVie
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;

api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java

@@ -143,7 +143,7 @@ public class UpdateVMCmd extends BaseCustomIdCmd implements SecurityGroupAction,
             + " Example: dhcpoptionsnetworklist[0].dhcp:114=url&dhcpoptionsetworklist[0].networkid=networkid&dhcpoptionsetworklist[0].dhcp:66=www.test.com")
     private Map dhcpOptionsNetworkList;
 
-    @Parameter(name = ApiConstants.EXTRA_CONFIG, type = CommandType.STRING, since = "4.12", description = "an optional URL encoded string that can be passed to the virtual machine upon successful deployment", authorized = { RoleType.Admin }, length = 5120)
+    @Parameter(name = ApiConstants.EXTRA_CONFIG, type = CommandType.STRING, since = "4.12", description = "an optional URL encoded string that can be passed to the virtual machine upon successful deployment", length = 5120)
     private String extraConfig;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java

@@ -131,6 +131,7 @@ public class AddVpnUserCmd extends BaseAsyncCreateCmd {
         if (domain != null) {
             vpnResponse.setDomainId(domain.getUuid());
             vpnResponse.setDomainName(domain.getName());
+            vpnResponse.setDomainPath(domain.getPath());
         }
 
         vpnResponse.setResponseName(getCommandName());

api/src/main/java/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java

@@ -75,6 +75,10 @@ public class AcquireIPAddressResponse  extends BaseResponse implements Controlle
  @Param(description = "the domain the public IP address is associated with")
  private String domainName;
 
+ @SerializedName(ApiConstants.DOMAIN_PATH)
+ @Param(description = "path of the domain to which the public IP address belongs", since = "4.19.2.0")
+ private String domainPath;
+
  @SerializedName(ApiConstants.FOR_VIRTUAL_NETWORK)
  @Param(description = "the virtual network for the IP address")
  private Boolean forVirtualNetwork;
@@ -190,6 +194,11 @@ public class AcquireIPAddressResponse  extends BaseResponse implements Controlle
      this.domainName = domainName;
  }
 
+ @Override
+ public void setDomainPath(String domainPath) {
+  this.domainPath = domainPath;
+ }
+
  public void setForVirtualNetwork(Boolean forVirtualNetwork) {
      this.forVirtualNetwork = forVirtualNetwork;
  }

api/src/main/java/org/apache/cloudstack/api/response/ApplicationLoadBalancerResponse.java

@@ -76,6 +76,10 @@ public class ApplicationLoadBalancerResponse extends BaseResponse implements Con
     @Param(description = "the domain of the Load Balancer")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the Load Balancer belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName("loadbalancerrule")
     @Param(description = "the list of rules associated with the Load Balancer", responseObject = ApplicationLoadBalancerRuleResponse.class)
     private List<ApplicationLoadBalancerRuleResponse> lbRules;
@@ -107,6 +111,11 @@ public class ApplicationLoadBalancerResponse extends BaseResponse implements Con
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java

@@ -74,6 +74,10 @@ public class AutoScalePolicyResponse extends BaseResponse implements ControlledE
     @Param(description = "the domain name of the autoscale policy")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the autoscale policy belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @Override
     public String getObjectId() {
         return this.id;
@@ -118,6 +122,11 @@ public class AutoScalePolicyResponse extends BaseResponse implements ControlledE
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java

@@ -123,6 +123,10 @@ public class AutoScaleVmGroupResponse extends BaseResponseWithAnnotations implem
     @Param(description = "the domain name of the vm group")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the vm group belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.FOR_DISPLAY)
     @Param(description = "is group for display to the regular user", since = "4.4", authorized = {RoleType.Admin})
     private Boolean forDisplay;
@@ -227,6 +231,11 @@ public class AutoScaleVmGroupResponse extends BaseResponseWithAnnotations implem
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java

@@ -114,6 +114,10 @@ public class AutoScaleVmProfileResponse extends BaseResponse implements Controll
     @Param(description = "the domain name of the vm profile")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the vm profile belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.FOR_DISPLAY)
     @Param(description = "is profile for display to the regular user", since = "4.4", authorized = {RoleType.Admin})
     private Boolean forDisplay;
@@ -196,6 +200,10 @@ public class AutoScaleVmProfileResponse extends BaseResponse implements Controll
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/BucketResponse.java

@@ -54,6 +54,10 @@ public class BucketResponse extends BaseResponseWithTagInformation implements Co
     @SerializedName(ApiConstants.DOMAIN)
     @Param(description = "the domain associated with the bucket")
     private String domainName;
+
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the bucket belongs", since = "4.19.2.0")
+    private String domainPath;
     @SerializedName(ApiConstants.OBJECT_STORAGE_ID)
     @Param(description = "id of the object storage hosting the Bucket; returned to admin user only")
     private String objectStoragePoolId;
@@ -146,6 +150,11 @@ public class BucketResponse extends BaseResponseWithTagInformation implements Co
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/ConditionResponse.java

@@ -61,6 +61,10 @@ public class ConditionResponse extends BaseResponse implements ControlledEntityR
     @Param(description = "the domain name of the owner.")
     private String domain;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the Condition owner belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.ZONE_ID)
     @Param(description = "zone id of counter")
     private String zoneId;
@@ -138,4 +142,9 @@ public class ConditionResponse extends BaseResponse implements ControlledEntityR
     public void setDomainName(String domainName) {
         this.domain = domainName;
     }
+
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
 }

api/src/main/java/org/apache/cloudstack/api/response/ControlledEntityResponse.java

@@ -27,4 +27,6 @@ public interface ControlledEntityResponse {
     public void setDomainId(String domainId);
 
     public void setDomainName(String domainName);
+
+    public void setDomainPath(String domainPath);
 }

api/src/main/java/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java

@@ -27,4 +27,6 @@ public interface ControlledViewEntityResponse {
     public void setDomainId(String domainId);
 
     public void setDomainName(String domainName);
+
+    public void setDomainPath(String domainPath);
 }

api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java

@@ -185,6 +185,10 @@ public class DomainRouterResponse extends BaseResponseWithAnnotations implements
     @Param(description = "the domain associated with the router")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the router belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.SERVICE_OFFERING_ID)
     @Param(description = "the ID of the service offering of the virtual machine")
     private String serviceOfferingId;
@@ -381,6 +385,10 @@ public class DomainRouterResponse extends BaseResponseWithAnnotations implements
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setPublicNetworkId(String publicNetworkId) {
         this.publicNetworkId = publicNetworkId;
     }

api/src/main/java/org/apache/cloudstack/api/response/EventResponse.java

@@ -69,6 +69,10 @@ public class EventResponse extends BaseResponse implements ControlledViewEntityR
     @Param(description = "the name of the account's domain")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the account's domain belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.RESOURCE_ID)
     @Param(description = "the id of the resource", since = "4.17.0")
     private String resourceId;
@@ -132,6 +136,11 @@ public class EventResponse extends BaseResponse implements ControlledViewEntityR
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setResourceId(String resourceId) {
         this.resourceId = resourceId;
     }

api/src/main/java/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java

@@ -82,6 +82,10 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll
     @Param(description = "the domain of the load balancer rule")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the load balancer rule belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.LOAD_BALANCER_RULE)
     @Param(description = "List of load balancer rules that are part of GSLB rule", responseObject = LoadBalancerResponse.class)
     private List<LoadBalancerResponse> siteLoadBalancers;
@@ -143,6 +147,11 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setSiteLoadBalancers(List<LoadBalancerResponse> siteLoadBalancers) {
         this.siteLoadBalancers = siteLoadBalancers;
     }

api/src/main/java/org/apache/cloudstack/api/response/GuestVlanRangeResponse.java

@@ -44,6 +44,10 @@ public class GuestVlanRangeResponse extends BaseResponse implements ControlledEn
     @Param(description = "the domain name of the guest VLAN range")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the guest VLAN range belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.GUEST_VLAN_RANGE)
     @Param(description = "the guest VLAN range")
     private String guestVlanRange;
@@ -83,6 +87,10 @@ public class GuestVlanRangeResponse extends BaseResponse implements ControlledEn
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setGuestVlanRange(String guestVlanRange) {
         this.guestVlanRange = guestVlanRange;
     }

api/src/main/java/org/apache/cloudstack/api/response/GuestVlanResponse.java

@@ -49,6 +49,10 @@ public class GuestVlanResponse extends BaseResponse implements ControlledEntityR
     @Param(description = "the domain name of the guest VLAN range")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the guest VLAN range belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.PROJECT_ID)
     @Param(description = "the project id of the guest VLAN range")
     private String projectId;
@@ -108,6 +112,10 @@ public class GuestVlanResponse extends BaseResponse implements ControlledEntityR
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java

@@ -75,6 +75,10 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co
     @Param(description = "the domain the public IP address is associated with")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the public IP address belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.FOR_VIRTUAL_NETWORK)
     @Param(description = "the virtual network for the IP address")
     private Boolean forVirtualNetwork;
@@ -211,6 +215,10 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setForVirtualNetwork(Boolean forVirtualNetwork) {
         this.forVirtualNetwork = forVirtualNetwork;
     }

api/src/main/java/org/apache/cloudstack/api/response/InstanceGroupResponse.java

@@ -63,6 +63,10 @@ public class InstanceGroupResponse extends BaseResponseWithAnnotations implement
     @Param(description = "the domain name of the instance group")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the instance group belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -90,6 +94,11 @@ public class InstanceGroupResponse extends BaseResponseWithAnnotations implement
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/LoadBalancerResponse.java

@@ -87,6 +87,10 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
     @Param(description = "the domain of the load balancer rule")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the load balancer rule belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.STATE)
     @Param(description = "the state of the rule")
     private String state;
@@ -158,6 +162,11 @@ public class LoadBalancerResponse extends BaseResponse implements ControlledEnti
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setState(String state) {
         this.state = state;
     }

api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java

@@ -424,6 +424,7 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
         this.domain = domain;
     }
 
+    @Override
     public void setDomainPath(String domainPath) {
         this.domainPath = domainPath;
     }

api/src/main/java/org/apache/cloudstack/api/response/OvsProviderResponse.java

@@ -54,6 +54,10 @@ public class OvsProviderResponse extends BaseResponse implements
     @Param(description = "the domain associated with the provider")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the provider belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;
@@ -73,6 +77,10 @@ public class OvsProviderResponse extends BaseResponse implements
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java

@@ -89,6 +89,10 @@ public class PrivateGatewayResponse extends BaseResponseWithAssociatedNetwork im
     @Param(description = "the domain associated with the private gateway")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the private gateway belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.STATE)
     @Param(description = "State of the gateway, can be Creating, Ready, Deleting")
     private String state;
@@ -165,6 +169,10 @@ public class PrivateGatewayResponse extends BaseResponseWithAssociatedNetwork im
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/ProjectAccountResponse.java

@@ -73,6 +73,10 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi
     @Param(description = "name of the Domain the account belongs too")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the account belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.USER)
     @Param(description = "the list of users associated with account", responseObject = UserResponse.class)
     private List<UserResponse> users;
@@ -110,6 +114,11 @@ public class ProjectAccountResponse extends BaseResponse implements ControlledVi
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setUserId(String userId) { this.userId = userId; }
 
     public void setProjectRoleId(String projectRoleId) {

api/src/main/java/org/apache/cloudstack/api/response/ProjectInvitationResponse.java

@@ -51,6 +51,10 @@ public class ProjectInvitationResponse extends BaseResponse implements Controlle
     @Param(description = "the domain name where the project belongs to")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the project belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "the account name of the project's owner")
     private String accountName;
@@ -87,6 +91,11 @@ public class ProjectInvitationResponse extends BaseResponse implements Controlle
         this.domainName = domain;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;

api/src/main/java/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java

@@ -65,6 +65,10 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
     @Param(description = "the domain name of the account of the remote access vpn")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the remote access vpn belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.STATE)
     @Param(description = "the state of the rule")
     private String state;
@@ -104,6 +108,10 @@ public class RemoteAccessVpnResponse extends BaseResponse implements ControlledE
         this.domainName = name;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setState(String state) {
         this.state = state;
     }

api/src/main/java/org/apache/cloudstack/api/response/ResourceCountResponse.java

@@ -45,6 +45,10 @@ public class ResourceCountResponse extends BaseResponse implements ControlledEnt
     @Param(description = "the domain name for which resource count's are updated")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the resource counts are updated", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.RESOURCE_TYPE)
     @Param(description = "resource type. Values include 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11. See the resourceType parameter for more information on these values.")
     private String resourceType;
@@ -76,6 +80,11 @@ public class ResourceCountResponse extends BaseResponse implements ControlledEnt
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setResourceType(Resource.ResourceType resourceType) {
         this.resourceType = Integer.valueOf(resourceType.getOrdinal()).toString();
         this.resourceTypeName = resourceType.getName();

api/src/main/java/org/apache/cloudstack/api/response/ResourceLimitResponse.java

@@ -40,6 +40,10 @@ public class ResourceLimitResponse extends BaseResponse implements ControlledEnt
     @Param(description = "the domain name of the resource limit")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the resource limit belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.RESOURCE_TYPE)
     @Param(description = "resource type. Values include 0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11. See the resourceType parameter for more information on these values.")
     private String resourceType;
@@ -84,6 +88,10 @@ public class ResourceLimitResponse extends BaseResponse implements ControlledEnt
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setResourceType(Resource.ResourceType resourceType) {
         this.resourceType = Integer.valueOf(resourceType.getOrdinal()).toString();
         this.resourceTypeName = resourceType.getName();

api/src/main/java/org/apache/cloudstack/api/response/ResourceTagResponse.java

@@ -61,6 +61,10 @@ public class ResourceTagResponse extends BaseResponse implements ControlledViewE
     @Param(description = "the domain associated with the tag")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain associated with the tag", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.CUSTOMER)
     @Param(description = "customer associated with the tag")
     private String customer;
@@ -96,6 +100,11 @@ public class ResourceTagResponse extends BaseResponse implements ControlledViewE
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/SecurityGroupResponse.java

@@ -63,6 +63,10 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie
     @Param(description = "the domain name of the security group")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the security group belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName("ingressrule")
     @Param(description = "the list of ingress rules associated with the security group", responseObject = SecurityGroupRuleResponse.class)
     private Set<SecurityGroupRuleResponse> ingressRules;
@@ -126,6 +130,11 @@ public class SecurityGroupResponse extends BaseResponse implements ControlledVie
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setSecurityGroupIngressRules(Set<SecurityGroupRuleResponse> securityGroupRules) {
         this.ingressRules = securityGroupRules;
     }

api/src/main/java/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java

@@ -98,6 +98,10 @@ public class Site2SiteCustomerGatewayResponse extends BaseResponseWithAnnotation
     @Param(description = "the domain name of the owner")
     private String domain;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "the domain path of the owner", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.REMOVED)
     @Param(description = "the date and time the host was removed")
     private Date removed;
@@ -193,4 +197,9 @@ public class Site2SiteCustomerGatewayResponse extends BaseResponseWithAnnotation
         this.domain = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
 }

api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java

@@ -120,6 +120,10 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse implements Cont
     @Param(description = "the domain name of the owner")
     private String domain;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "the domain path of the owner", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.CREATED)
     @Param(description = "the date and time the host was created")
     private Date created;
@@ -241,6 +245,11 @@ public class Site2SiteVpnConnectionResponse extends BaseResponse implements Cont
         this.domain = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setForDisplay(Boolean forDisplay) {
         this.forDisplay = forDisplay;
     }

api/src/main/java/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java

@@ -66,6 +66,10 @@ public class Site2SiteVpnGatewayResponse extends BaseResponse implements Control
     @Param(description = "the domain name of the owner")
     private String domain;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "the domain path of the owner", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.REMOVED)
     @Param(description = "the date and time the host was removed")
     private Date removed;
@@ -119,6 +123,10 @@ public class Site2SiteVpnGatewayResponse extends BaseResponse implements Control
         this.domain = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setForDisplay(Boolean forDisplay) {
         this.forDisplay = forDisplay;
     }

api/src/main/java/org/apache/cloudstack/api/response/SnapshotResponse.java

@@ -47,6 +47,10 @@ public class SnapshotResponse extends BaseResponseWithTagInformation implements
     @Param(description = "the domain name of the snapshot's account")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the snapshot's account belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.PROJECT_ID)
     @Param(description = "the project id of the snapshot")
     private String projectId;
@@ -187,6 +191,11 @@ public class SnapshotResponse extends BaseResponseWithTagInformation implements
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setSnapshotType(String snapshotType) {
         this.snapshotType = snapshotType;
     }

api/src/main/java/org/apache/cloudstack/api/response/StaticRouteResponse.java

@@ -70,6 +70,10 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
     @Param(description = "the domain associated with the static route")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "the domain path associated with the static route", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.TAGS)
     @Param(description = "the list of resource tags associated with static route", responseObject = ResourceTagResponse.class)
     private List<ResourceTagResponse> tags;
@@ -114,6 +118,10 @@ public class StaticRouteResponse extends BaseResponse implements ControlledEntit
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java

@@ -135,6 +135,10 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
     @Param(description = "the name of the domain to which the template belongs")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the template belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.DOMAIN_ID)
     @Param(description = "the ID of the domain to which the template belongs")
     private String domainId;
@@ -354,6 +358,11 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     @Override
     public void setDomainId(String domainId) {
         this.domainId = domainId;

api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java

@@ -52,6 +52,10 @@ public class UsageRecordResponse extends BaseResponseWithTagInformation implemen
     @Param(description = "the domain the resource is associated with")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the usage reocrd belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.ZONE_ID)
     @Param(description = "the zone ID")
     private String zoneId;
@@ -277,6 +281,10 @@ public class UsageRecordResponse extends BaseResponseWithTagInformation implemen
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setNetworkId(String networkId) {
         this.networkId = networkId;
     }

api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java

@@ -54,6 +54,10 @@ public class UserDataResponse extends BaseResponseWithAnnotations implements Con
     @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the userdata owner")
     private String domain;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the userdata owner belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded userdata content")
     private String userData;
 
@@ -143,4 +147,9 @@ public class UserDataResponse extends BaseResponseWithAnnotations implements Con
     public void setDomainName(String domain) {
         this.domain = domain;
     }
+
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
 }

api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java

@@ -82,6 +82,10 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "the name of the domain in which the virtual machine exists")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain in which the virtual machine exists", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.CREATED)
     @Param(description = "the date when this virtual machine was created")
     private Date created;
@@ -703,6 +707,10 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public void setCreated(Date created) {
         this.created = created;
     }

api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java

@@ -108,6 +108,10 @@ public class VMSnapshotResponse extends BaseResponseWithTagInformation implement
     @Param(description = "the domain associated with the disk volume")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the disk volume belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.HYPERVISOR)
     @Param(description = "the type of hypervisor on which snapshot is stored")
     private String hypervisor;
@@ -261,6 +265,11 @@ public class VMSnapshotResponse extends BaseResponseWithTagInformation implement
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setTags(Set<ResourceTagResponse> tags) {
         this.tags = tags;
     }

api/src/main/java/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java

@@ -60,6 +60,10 @@ public class VirtualRouterProviderResponse extends BaseResponse implements Contr
     @Param(description = "the domain associated with the provider")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the provider belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @Override
     public void setAccountName(String accountName) {
         this.accountName = accountName;
@@ -79,6 +83,10 @@ public class VirtualRouterProviderResponse extends BaseResponse implements Contr
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

api/src/main/java/org/apache/cloudstack/api/response/VlanIpRangeResponse.java

@@ -55,6 +55,10 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
     @Param(description = "the domain name of the VLAN IP range")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the VLAN IP range belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.POD_ID)
     @Param(description = "the Pod ID for the VLAN IP range")
     private String podId;
@@ -166,6 +170,11 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setPodId(String podId) {
         this.podId = podId;
     }

api/src/main/java/org/apache/cloudstack/api/response/VolumeResponse.java

@@ -145,6 +145,10 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "the domain associated with the disk volume")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain the disk volume belongs to", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName("storagetype")
     @Param(description = "shared or local storage")
     private String storageType;
@@ -409,6 +413,11 @@ public class VolumeResponse extends BaseResponseWithTagInformation implements Co
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
+
     public void setStorageType(String storageType) {
         this.storageType = storageType;
     }

api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java

@@ -96,6 +96,10 @@ public class VpcResponse extends BaseResponseWithAnnotations implements Controll
     @Param(description = "the domain name of the owner")
     private String domain;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "the domain path of the owner", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.NETWORK)
     @Param(description = "the list of networks belongign to the VPC", responseObject = NetworkResponse.class)
     private List<NetworkResponse> networks;
@@ -209,6 +213,11 @@ public class VpcResponse extends BaseResponseWithAnnotations implements Controll
         domain = domainName;
     }
 
+    @Override
+    public void setDomainPath(String path) {
+        this.domainPath = path;
+    }
+
     public void setZoneId(final String zoneId) {
         this.zoneId = zoneId;
     }

api/src/main/java/org/apache/cloudstack/api/response/VpnUsersResponse.java

@@ -48,6 +48,10 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe
     @Param(description = "the domain name of the account of the remote access vpn")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the remote access vpn belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.PROJECT_ID)
     @Param(description = "the project id of the vpn")
     private String projectId;
@@ -83,6 +87,11 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe
         this.domainName = name;
     }
 
+    @Override
+    public void setDomainPath(String path) {
+        this.domainPath = path;
+    }
+
     @Override
     public void setProjectId(String projectId) {
         this.projectId = projectId;

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

@@ -582,6 +582,7 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
         Domain domain = ApiDBUtils.findDomainById(kubernetesCluster.getDomainId());
         response.setDomainId(domain.getUuid());
         response.setDomainName(domain.getName());
+        response.setDomainPath(domain.getPath());
         response.setKeypair(kubernetesCluster.getKeyPair());
         response.setState(kubernetesCluster.getState().toString());
         response.setCores(String.valueOf(kubernetesCluster.getCores()));

plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java

@@ -98,6 +98,10 @@ public class KubernetesClusterResponse extends BaseResponseWithAnnotations imple
     @Param(description = "the name of the domain in which the Kubernetes cluster exists")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the domain to which the Kubernetes cluster belongs", since = "4.19.2.0")
+    private String domainPath;
+
     @SerializedName(ApiConstants.SSH_KEYPAIR)
     @Param(description = "keypair details")
     private String keypair;
@@ -279,6 +283,10 @@ public class KubernetesClusterResponse extends BaseResponseWithAnnotations imple
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
     public String getKeypair() {
         return keypair;
     }

plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/api/response/ServiceInstanceResponse.java

@@ -59,6 +59,10 @@ public class ServiceInstanceResponse extends BaseResponse implements ControlledE
     @Param(description = "the name of the domain in which the virtual machine exists")
     private String domainName;
 
+    @SerializedName(ApiConstants.DOMAIN_PATH)
+    @Param(description = "path of the Domain in which the virtual machine exists", since = "4.19.2.0")
+    private String domainPath;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -88,4 +92,8 @@ public class ServiceInstanceResponse extends BaseResponse implements ControlledE
         this.domainName = domainName;
     }
 
+    @Override
+    public void setDomainPath(String domainPath) {
+        this.domainPath = domainPath;
+    }
 }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -795,6 +795,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         if (domain != null) {
             vmSnapshotResponse.setDomainId(domain.getUuid());
             vmSnapshotResponse.setDomainName(domain.getName());
+            vmSnapshotResponse.setDomainPath(domain.getPath());
         }
 
         List<? extends ResourceTag> tags = _resourceTagDao.listBy(vmSnapshot.getId(), ResourceObjectType.VMSnapshot);
@@ -2243,6 +2244,7 @@ public class ApiResponseHelper implements ResponseGenerator {
 
             response.setDomainId(securityGroup.getDomainUuid());
             response.setDomainName(securityGroup.getDomainName());
+            response.setDomainPath(securityGroup.getDomainPath());
 
             for (SecurityRule securityRule : securityRules) {
                 SecurityGroupRuleResponse securityGroupData = new SecurityGroupRuleResponse();
@@ -2647,6 +2649,7 @@ public class ApiResponseHelper implements ResponseGenerator {
             if (domain != null) {
                 response.setDomainId(domain.getUuid());
                 response.setDomainName(domain.getName());
+                response.setDomainPath(domain.getPath());
             }
 
         }
@@ -2895,6 +2898,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         Domain domain = ApiDBUtils.findDomainById(object.getDomainId());
         response.setDomainId(domain.getUuid());
         response.setDomainName(domain.getName());
+        response.setDomainPath(domain.getPath());
     }
 
     private void populateOwner(ControlledViewEntityResponse response, ControlledEntity object) {
@@ -2912,6 +2916,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         Domain domain = ApiDBUtils.findDomainById(object.getDomainId());
         response.setDomainId(domain.getUuid());
         response.setDomainName(domain.getName());
+        response.setDomainPath(domain.getPath());
     }
 
     public static void populateOwner(ControlledViewEntityResponse response, ControlledViewEntity object) {
@@ -2925,6 +2930,7 @@ public class ApiResponseHelper implements ResponseGenerator {
 
         response.setDomainId(object.getDomainUuid());
         response.setDomainName(object.getDomainName());
+        response.setDomainPath(object.getDomainPath());
     }
 
     private void populateAccount(ControlledEntityResponse response, long accountId) {
@@ -2951,6 +2957,7 @@ public class ApiResponseHelper implements ResponseGenerator {
 
         response.setDomainId(domain.getUuid());
         response.setDomainName(domain.getName());
+        response.setDomainPath(domain.getPath());
     }
 
     @Override
@@ -3889,6 +3896,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         if (domain != null) {
             usageRecResponse.setDomainId(domain.getUuid());
             usageRecResponse.setDomainName(domain.getName());
+            usageRecResponse.setDomainPath(domain.getPath());
         }
 
         if (usageRecord.getZoneId() != null) {
@@ -4686,6 +4694,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         if (domain != null) {
             response.setDomainId(domain.getUuid());
             response.setDomainName(domain.getName());
+            response.setDomainPath(domain.getPath());
         }
 
         response.setObjectName("affinitygroup");

server/src/main/java/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java

@@ -208,6 +208,7 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO,
 
         routerResponse.setDomainId(router.getDomainUuid());
         routerResponse.setDomainName(router.getDomainName());
+        routerResponse.setDomainPath(router.getDomainPath());
 
         routerResponse.setZoneName(router.getDataCenterName());
         routerResponse.setDns1(router.getDns1());

server/src/main/java/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java

@@ -59,6 +59,7 @@ public class ProjectAccountJoinDaoImpl extends GenericDaoBase<ProjectAccountJoin
         projectAccountResponse.setRole(proj.getAccountRole().toString());
         projectAccountResponse.setDomainId(proj.getDomainUuid());
         projectAccountResponse.setDomainName(proj.getDomainName());
+        projectAccountResponse.setDomainPath(proj.getDomainPath());
 
         projectAccountResponse.setObjectName("projectaccount");
 

server/src/main/java/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java

@@ -65,6 +65,7 @@ public class ProjectInvitationJoinDaoImpl extends GenericDaoBase<ProjectInvitati
 
         response.setDomainId(invite.getDomainUuid());
         response.setDomainName(invite.getDomainName());
+        response.setDomainPath(invite.getDomainPath());
 
         response.setObjectName("projectinvitation");
         return response;

server/src/main/java/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java

@@ -80,6 +80,7 @@ public class ResourceTagJoinDaoImpl extends GenericDaoBase<ResourceTagJoinVO, Lo
 
             response.setDomainId(resourceTag.getDomainUuid());
             response.setDomainName(resourceTag.getDomainName());
+            response.setDomainPath(resourceTag.getDomainPath());
 
             response.setCustomer(resourceTag.getCustomer());
         }

server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java

@@ -274,6 +274,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
         // populate domain
         templateResponse.setDomainId(template.getDomainUuid());
         templateResponse.setDomainName(template.getDomainName());
+        templateResponse.setDomainPath(template.getDomainPath());
 
         // If the user is an 'Admin' or 'the owner of template' or template belongs to a project, add the template download status
         if (view == ResponseView.Full ||
@@ -413,6 +414,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
         // populate domain
         response.setDomainId(result.getDomainUuid());
         response.setDomainName(result.getDomainName());
+        response.setDomainPath(result.getDomainPath());
 
         // set details map
         if (result.getDetailName() != null) {
@@ -499,6 +501,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
         // populate domain
         isoResponse.setDomainId(iso.getDomainUuid());
         isoResponse.setDomainName(iso.getDomainName());
+        isoResponse.setDomainPath(iso.getDomainPath());
 
         Account caller = CallContext.current().getCallingAccount();
         boolean isAdmin = false;

server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java

@@ -167,6 +167,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
         }
         userVmResponse.setDomainId(userVm.getDomainUuid());
         userVmResponse.setDomainName(userVm.getDomainName());
+        userVmResponse.setDomainPath(userVm.getDomainPath());
 
         userVmResponse.setCreated(userVm.getCreated());
         userVmResponse.setLastUpdated(userVm.getLastUpdated());

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

@@ -1391,7 +1391,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
 
     private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long newSize, Long newMinIops, Long newMaxIops, Integer newHypervisorSnapshotReserve, Long newDiskOfferingId,
                                              boolean shrinkOk) {
-        final VolumeVO volume = _volsDao.findById(volumeId);
+        VolumeVO volume = _volsDao.findById(volumeId);
         UserVmVO userVm = _userVmDao.findById(volume.getInstanceId());
         StoragePoolVO storagePool = _storagePoolDao.findById(volume.getPoolId());
         Long currentDiskOfferingId = volume.getDiskOfferingId();
@@ -1499,12 +1499,12 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             }
 
             // Update size if volume has same size as before, else it is already updated
-            final VolumeVO volumeNow = _volsDao.findById(volumeId);
+            volume = _volsDao.findById(volumeId);
-            if (currentSize == volumeNow.getSize() && currentSize != newSize) {
+            if (currentSize == volume.getSize() && currentSize != newSize) {
                 volume.setSize(newSize);
-            } else if (volumeNow.getSize() != newSize) {
+            } else if (volume.getSize() != newSize) {
                 // consider the updated size as the new size
-                newSize = volumeNow.getSize();
+                newSize = volume.getSize();
             }
 
             _volsDao.update(volume.getId(), volume);

test/integration/component/test_acl_isolatednetwork.py

@@ -799,7 +799,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
             self.fail("Domain admin is allowed to deploy vm for users not in hos domain ")
         except Exception as e:
             self.debug("When Domain admin tries to deploy vm for users in their sub domain %s" % e)
-            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN):
+            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                 self.fail("Error message validation failed when Domain admin tries to deploy vm for users not in hos domain ")
 
     @attr("simulator_only", tags=["advanced"], required_hardware="false")
@@ -876,7 +876,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
             self.fail("Regular user is allowed to deploy vm for other users in their domain ")
         except Exception as e:
             self.debug("When user tries to deploy vm for users in their domain %s" % e)
-            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
+            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                 self.fail("Error message validation failed when Regular user tries to deploy vm for other users in their domain ")
 
     @attr("simulator_only", tags=["advanced"], required_hardware="false")
@@ -903,7 +903,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
             self.fail("Regular user is allowed to deploy vm for users not in their domain ")
         except Exception as e:
             self.debug("When user tries to deploy vm for users n different domain %s" % e)
-            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
+            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                 self.fail("Error message validation failed when Regular user tries to deploy vm for users not in their domain ")
 
     @attr("simulator_only", tags=["advanced"], required_hardware="false")
@@ -1030,7 +1030,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
             self.fail("Domain admin is allowed to restart network for users not in their domain ")
         except Exception as e:
             self.debug("When Domain admin tries to restart network for users in their sub domain %s" % e)
-            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN):
+            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                 self.fail("Error message validation failed when Domain admin tries to restart network for users not in their domain ")
 
     ## Test cases relating restart network as regular user
@@ -1061,7 +1061,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
             self.fail("Regular user is allowed to restart network for users in their domain ")
         except Exception as e:
             self.debug("When user tries to restart network for users in their domain %s" % e)
-            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
+            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                 self.fail("Error message validation failed when Regular user tries to restart network for users in their domain ")
 
     @attr("simulator_only", tags=["advanced"], required_hardware="false")
@@ -1077,7 +1077,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
             self.fail("Regular user is allowed to restart network for users not in their domain ")
         except Exception as e:
             self.debug("When user tries to restart network for users in other domain %s" % e)
-            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
+            if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                 self.fail("Error message validation failed when Regular user is allowed to restart network for users not in their domain ")
 
     @staticmethod

test/integration/component/test_acl_isolatednetwork_delete.py

@@ -455,7 +455,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
             self.fail("Domain admin is allowed to delete network for users not in their domain ")
         except Exception as e:
             self.debug ("When Domain admin tries to delete network for user in a different domain %s" %e)
-            if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN):
+            if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                self.fail("Error message validation failed when Domain admin tries to delete network for users not in their domain ")
 
 ## Test cases relating deleting network as regular user
@@ -490,7 +490,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
             self.fail("Regular user is allowed to delete network for users in their domain ")
         except Exception as e:
                 self.debug ("When user tries to delete network for users in their domain %s" %e)
-                if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
+                if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                     self.fail("Regular user is allowed to delete network for users in their domain ")
 
     @attr("simulator_only",tags=["advanced"],required_hardware="false")
@@ -508,7 +508,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
             self.fail("Regular user is allowed to delete network for users not in their domain ")
         except Exception as e:
             self.debug ("When user tries to delete network for users in other domain %s" %e)
-            if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
+            if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_SOURCE):
                 self.fail("Error message validation failed when Regular user tries to delete network for users not in their domain ")
 
     @staticmethod

ui/src/views/AutogenView.vue

@@ -799,7 +799,7 @@ export default {
       }
 
       this.projectView = Boolean(store.getters.project && store.getters.project.id)
-      this.hasProjectId = ['vm', 'vmgroup', 'ssh', 'affinitygroup', 'userdata', 'volume', 'snapshot', 'vmsnapshot', 'guestnetwork',
+      this.hasProjectId = ['vm', 'vmgroup', 'ssh', 'affinitygroup', 'userdata', 'volume', 'snapshot', 'buckets', 'vmsnapshot', 'guestnetwork',
         'vpc', 'securitygroups', 'publicip', 'vpncustomergateway', 'template', 'iso', 'event', 'kubernetes',
         'autoscalevmgroup', 'vnfapp', 'webhook'].includes(this.$route.name)