apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.15'

Browse Source
This commit is contained in:
Rohit Yadav 2021-06-07 15:34:52 +05:30
commit d10cdb495f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
View File

@ -18,9 +18,12 @@ package com.cloud.network.dao;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.Set;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.inject.Inject; import javax.inject.Inject;
@ -108,6 +111,9 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long>implements Ne
Random _rand = new Random(System.currentTimeMillis()); Random _rand = new Random(System.currentTimeMillis());
long _prefix = 0x2; long _prefix = 0x2;
private static final Set<String> VLAN_OR_VXLAN = new HashSet<>(Arrays.asList(BroadcastDomainType.Vlan.toString().toLowerCase(),
BroadcastDomainType.Vxlan.toString().toLowerCase()));
public NetworkDaoImpl() { public NetworkDaoImpl() {
} }
@ -803,8 +809,9 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long>implements Ne
@Override @Override
public List<NetworkVO> listByPhysicalNetworkPvlan(long physicalNetworkId, String broadcastUri) { public List<NetworkVO> listByPhysicalNetworkPvlan(long physicalNetworkId, String broadcastUri) {
final URI searchUri = BroadcastDomainType.fromString(broadcastUri); final URI searchUri = BroadcastDomainType.fromString(broadcastUri);
if (!searchUri.getScheme().equalsIgnoreCase("vlan")) { if (!VLAN_OR_VXLAN.contains(searchUri.getScheme().toLowerCase())) {
throw new CloudRuntimeException("VLAN requested but URI is not in the expected format: " + searchUri.toString()); throw new CloudRuntimeException(
String.format("Requested URI '%s' is not in the expected format. Expected URI Scheme as 'vlan://VID' or 'vxlan://VID'.", searchUri.toString()));
} }
final String searchRange = BroadcastDomainType.getValue(searchUri); final String searchRange = BroadcastDomainType.getValue(searchUri);
final List<Integer> searchVlans = UriUtils.expandVlanUri(searchRange); final List<Integer> searchVlans = UriUtils.expandVlanUri(searchRange);

2
ui/src/components/view/DetailsTab.vue
View File

@ -50,7 +50,7 @@
</div> </div>
</div> </div>
</a-list-item> </a-list-item>
<a-list-item slot="renderItem" slot-scope="item" v-else-if="item === 'ip6address' && ipV6Address.length > 0"> <a-list-item slot="renderItem" slot-scope="item" v-else-if="item === 'ip6address' && ipV6Address && ipV6Address.length > 0">
<div> <div>
<strong>{{ $t('label.' + String(item).toLowerCase()) }}</strong> <strong>{{ $t('label.' + String(item).toLowerCase()) }}</strong>
<br/> <br/>