rhtyd closed pull request #2203: [CLOUDSTACK-10029] All private, public, and
guest interfaceses are marked as untagged ca?
URL: https://github.com/apache/cloudstack/pull/2203
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 2440e624ffa..c2a759b1e88 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1695,8 +1695,7 @@ public ExecutionResult prepareNetworkElementCommand(final
IpAssocCommand cmd) {
if (nic.getBrName().equalsIgnoreCase(_linkLocalBridgeName)) {
broadcastUriAllocatedToVM.put("LinkLocal", nicPos);
} else {
- if (nic.getBrName().equalsIgnoreCase(_publicBridgeName) ||
nic.getBrName().equalsIgnoreCase(_privBridgeName) ||
-
nic.getBrName().equalsIgnoreCase(_guestBridgeName)) {
+ if (nic.getBrName() == null) {
broadcastUriAllocatedToVM.put(BroadcastDomainType.Vlan.toUri(Vlan.UNTAGGED).toString(),
nicPos);
} else {
final String broadcastUri =
getBroadcastUriFromBridge(nic.getBrName());
@@ -1749,8 +1748,7 @@ protected ExecutionResult
cleanupNetworkElementCommand(final IpAssocCommand cmd)
if (nic.getBrName().equalsIgnoreCase(_linkLocalBridgeName)) {
broadcastUriAllocatedToVM.put("LinkLocal", nicPos);
} else {
- if (nic.getBrName().equalsIgnoreCase(_publicBridgeName) ||
nic.getBrName().equalsIgnoreCase(_privBridgeName) ||
-
nic.getBrName().equalsIgnoreCase(_guestBridgeName)) {
+ if (nic.getBrName() == null) {
broadcastUriAllocatedToVM.put(BroadcastDomainType.Vlan.toUri(Vlan.UNTAGGED).toString(),
nicPos);
} else {
final String broadcastUri =
getBroadcastUriFromBridge(nic.getBrName());
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
