Skip to content

Commit 3486a3c

Browse files
Add domainpath to listnetwork and UI network tab (#7386)
1 parent 0c14e46 commit 3486a3c

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
163163
@Param(description = "the domain name of the network owner")
164164
private String domain;
165165

166+
@SerializedName(ApiConstants.DOMAIN_PATH)
167+
@Param(description = "path of the Domain the network belongs to", since = "4.19.0.0")
168+
private String domainPath;
169+
166170
@SerializedName("isdefault")
167171
@Param(description = "true if network is default, false otherwise")
168172
private Boolean isDefault;
@@ -420,6 +424,10 @@ public void setDomainName(String domain) {
420424
this.domain = domain;
421425
}
422426

427+
public void setDomainPath(String domainPath) {
428+
this.domainPath = domainPath;
429+
}
430+
423431
public void setNetworkOfferingAvailability(String networkOfferingAvailability) {
424432
this.networkOfferingAvailability = networkOfferingAvailability;
425433
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2572,6 +2572,10 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
25722572
Domain domain = ApiDBUtils.findDomainById(domainNetworkDetails.first());
25732573
if (domain != null) {
25742574
response.setDomainId(domain.getUuid());
2575+
2576+
StringBuilder domainPath = new StringBuilder("ROOT");
2577+
(domainPath.append(domain.getPath())).deleteCharAt(domainPath.length() - 1);
2578+
response.setDomainPath(domainPath.toString());
25752579
}
25762580
}
25772581
response.setSubdomainAccess(domainNetworkDetails.second());

ui/src/config/section/network.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ export default {
3434
permission: ['listNetworks'],
3535
resourceType: 'Network',
3636
columns: () => {
37-
var fields = ['name', 'state', 'type', 'vpcname', 'cidr', 'ip6cidr', 'broadcasturi', 'account', 'domain', 'zonename']
37+
var fields = ['name', 'state', 'type', 'vpcname', 'cidr', 'ip6cidr', 'broadcasturi', 'domainpath', 'account', 'zonename']
3838
if (!isAdmin()) {
3939
fields = fields.filter(function (e) { return e !== 'broadcasturi' })
4040
}
4141
return fields
4242
},
4343
details: () => {
44-
var fields = ['name', 'id', 'description', 'type', 'traffictype', 'vpcid', 'vlan', 'broadcasturi', 'cidr', 'ip6cidr', 'netmask', 'gateway', 'aclname', 'ispersistent', 'restartrequired', 'reservediprange', 'redundantrouter', 'networkdomain', 'egressdefaultpolicy', 'zonename', 'account', 'domain', 'associatednetwork', 'associatednetworkid', 'ip6firewall', 'ip6routing', 'ip6routes', 'dns1', 'dns2', 'ip6dns1', 'ip6dns2', 'publicmtu', 'privatemtu']
44+
var fields = ['name', 'id', 'description', 'type', 'traffictype', 'vpcid', 'vlan', 'broadcasturi', 'cidr', 'ip6cidr', 'netmask', 'gateway', 'aclname', 'ispersistent', 'restartrequired', 'reservediprange', 'redundantrouter', 'networkdomain', 'egressdefaultpolicy', 'zonename', 'account', 'domainpath', 'associatednetwork', 'associatednetworkid', 'ip6firewall', 'ip6routing', 'ip6routes', 'dns1', 'dns2', 'ip6dns1', 'ip6dns2', 'publicmtu', 'privatemtu']
4545
if (!isAdmin()) {
4646
fields = fields.filter(function (e) { return e !== 'broadcasturi' })
4747
}
4848
return fields
4949
},
50-
filters: ['all', 'account', 'domain', 'shared'],
50+
filters: ['all', 'account', 'domainpath', 'shared'],
5151
searchFilters: ['keyword', 'zoneid', 'domainid', 'account', 'type', 'tags'],
5252
related: [{
5353
name: 'vm',

0 commit comments

Comments
 (0)