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:18:54 UTC
[1/3] git commit: updated refs/heads/master-6-17-stable to 12e984f
Updated Branches:
refs/heads/master-6-17-stable a173130de -> 12e984f86
41-42 DB upgrade: fixed physicalNetworkUpdate method - one of the preparedStatement elements wasn't set
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05aba494
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05aba494
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05aba494
Branch: refs/heads/master-6-17-stable
Commit: 05aba494b5ca5886988ac5020f34c046b041ea11
Parents: a173130
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 1 11:54:30 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jul 2 10:06:09 2013 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05aba494/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 90a311b..d465af9 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -1094,6 +1094,7 @@ public class Upgrade410to420 implements DbUpgrade {
//Add internal lb vm to the list of physical network elements
PreparedStatement pstmt1 = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers`" +
" WHERE physical_network_id=? AND provider_name='InternalLbVm'");
+ pstmt1.setLong(1, pNtwkId);
ResultSet rs1 = pstmt1.executeQuery();
while (rs1.next()) {
long providerId = rs1.getLong(1);
@@ -1106,7 +1107,7 @@ public class Upgrade410to420 implements DbUpgrade {
}
} catch (SQLException e) {
- throw new CloudRuntimeException("Unable existing physical networks with internal lb provider", e);
+ throw new CloudRuntimeException("Unable to update existing physical networks with internal lb provider", e);
} finally {
try {
if (rs != null) {
[3/3] git commit: updated refs/heads/master-6-17-stable to 12e984f
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
Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12e984f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12e984f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12e984f8
Branch: refs/heads/master-6-17-stable
Commit: 12e984f869a487a1370be652b0cfc3bbe687d9b7
Parents: d001e43
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:08:50 2013 -0700
----------------------------------------------------------------------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 5 +++--
server/src/com/cloud/network/NetworkManagerImpl.java | 8 +++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12e984f8/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 eba246f..27c1a51 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2892,9 +2892,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());
+ throw new InvalidParameterValueException("The VLAN tag " + vlanId
+ + " 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/12e984f8/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 eef5d76..63e9708 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2449,7 +2449,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) {
[2/3] git commit: updated refs/heads/master-6-17-stable to 12e984f
Posted by al...@apache.org.
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/d001e43f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d001e43f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d001e43f
Branch: refs/heads/master-6-17-stable
Commit: d001e43fb4a5578e17e411d96764d7b3a8c3bf90
Parents: 05aba49
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:06:34 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/d001e43f/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 f88f600..8cdcfde 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;
}
}