You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2020/04/23 17:57:57 UTC
[cloudstack] branch 4.13 updated: Fixed guest vlan range going
missing when using zone wizzard (#4042)
This is an automated email from the ASF dual-hosted git repository.
andrijapanic pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.13 by this push:
new 7b7caf5 Fixed guest vlan range going missing when using zone wizzard (#4042)
7b7caf5 is described below
commit 7b7caf555981534990f4cc2a2492b7aadafa969e
Author: Spaceman1984 <49...@users.noreply.github.com>
AuthorDate: Thu Apr 23 19:57:43 2020 +0200
Fixed guest vlan range going missing when using zone wizzard (#4042)
---
ui/scripts/zoneWizard.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 5b7c25f..785f388 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -4173,7 +4173,7 @@
} else if (args.data.returnedZone.networktype == "Advanced") { //update VLAN in physical network(s) in advanced zone
var physicalNetworksHavingGuestIncludingVlan = [];
$(args.data.physicalNetworks).each(function() {
- if (this.guestConfiguration != null && this.guestConfiguration.vlanRangeStart != null && this.guestConfiguration.vlanRangeStart.length > 0) {
+ if (args.data.guestTraffic != null && args.data.guestTraffic.vlanRangeStart != null && args.data.guestTraffic.vlanRangeStart.length > 0) {
physicalNetworksHavingGuestIncludingVlan.push(this);
}
});
@@ -4186,10 +4186,10 @@
var updatedCount = 0;
$(physicalNetworksHavingGuestIncludingVlan).each(function() {
var vlan;
- if (this.guestConfiguration.vlanRangeEnd == null || this.guestConfiguration.vlanRangeEnd.length == 0)
- vlan = this.guestConfiguration.vlanRangeStart;
+ if (args.data.guestTraffic.vlanRangeEnd == null || args.data.guestTraffic.vlanRangeEnd.length == 0)
+ vlan = args.data.guestTraffic.vlanRangeStart;
else
- vlan = this.guestConfiguration.vlanRangeStart + "-" + this.guestConfiguration.vlanRangeEnd;
+ vlan = args.data.guestTraffic.vlanRangeStart + "-" + args.data.guestTraffic.vlanRangeEnd;
var originalId = this.id;
var returnedId;