You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/07/02 19:28:41 UTC
[1/2] git commit: updated refs/heads/4.2 to 724be3f
Updated Branches:
refs/heads/4.2 e950b3a9f -> 724be3f5f
CLOUDSTACK-236: log uuid instead of actual db id, in the updateNetworkOffering method
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd7e21b6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd7e21b6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd7e21b6
Branch: refs/heads/4.2
Commit: cd7e21b6b15db98579d21c7828f7366f226addbf
Parents: e950b3a
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 1 15:09:06 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jul 2 10:19:49 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd7e21b6/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 5e900bb..8346871 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2025,7 +2025,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
}
// check if the network is upgradable
if (!canUpgrade(network, oldNetworkOfferingId, networkOfferingId)) {
- throw new InvalidParameterValueException("Can't upgrade from network offering " + oldNetworkOfferingId + " to " + networkOfferingId + "; check logs for more information");
+ throw new InvalidParameterValueException("Can't upgrade from network offering " + oldNtwkOff.getUuid() +
+ " to " + networkOffering.getUuid() + "; check logs for more information");
}
restartNetwork = true;
networkOfferingChanged = true;
@@ -2333,7 +2334,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
return false;
}
if (!oldNetworkOffering.getTags().equalsIgnoreCase(newNetworkOffering.getTags())) {
- s_logger.debug("Network offerings " + newNetworkOfferingId + " and " + oldNetworkOfferingId + " have different tags, can't upgrade");
+ s_logger.debug("Network offerings " + newNetworkOffering.getUuid() + " and " + oldNetworkOffering.getUuid() + " have different tags, can't upgrade");
return false;
}
}
[2/2] git commit: updated refs/heads/4.2 to 724be3f
Posted by al...@apache.org.
CLOUDSTACK-2984: createNetwork call - when vlan is specified, check that its not coming from the physical network vnet range as this range is used for dynamic vlan allocation during the network implementation stage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/724be3f5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/724be3f5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/724be3f5
Branch: refs/heads/4.2
Commit: 724be3f5f79253a98628929e4e74412a2e76a383
Parents: cd7e21b
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 1 16:08:37 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jul 2 10:20:07 2013 -0700
----------------------------------------------------------------------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++--
server/src/com/cloud/network/NetworkManagerImpl.java | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/724be3f5/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 2089f82..8d8b126 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3120,10 +3120,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
}
- // Check if a guest VLAN is using the same tag
+ // Check if the vlan is being used
if (_zoneDao.findVnet(zoneId, physicalNetworkId, vlanId).size() > 0) {
throw new InvalidParameterValueException("The VLAN tag " + vlanId
- + " is already being used for the guest network in zone " + zone.getName());
+ + " is already being used for dynamic vlan allocation for the guest network in zone " + zone.getName());
}
String ipRange = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/724be3f5/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 938d9b1..dac6a3a 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2467,7 +2467,13 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
}
}
- if (vlanId != null) {
+ if (vlanSpecified) {
+ //don't allow to specify vlan tag used by physical network for dynamic vlan allocation
+ if (_dcDao.findVnet(zoneId, pNtwk.getId(), vlanId).size() > 0) {
+ throw new InvalidParameterValueException("The VLAN tag " + vlanId
+ + " is already being used for dynamic vlan allocation for the guest network in zone " + zone.getName());
+ }
+
String uri = "vlan://" + vlanId;
// For Isolated networks, don't allow to create network with vlan that already exists in the zone
if (ntwkOff.getGuestType() == GuestType.Isolated) {