You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/25 20:04:57 UTC
[01/20] git commit: updated refs/heads/4.3 to 67df5b9
Repository: cloudstack
Updated Branches:
refs/heads/4.3 f72eb9455 -> 67df5b9da
CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared
networks
fix ensures only admin users can delete shared network
(cherry picked from commit 2f293f42d567b1218cb083250707eeffc5324dc3)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30dd76fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30dd76fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30dd76fc
Branch: refs/heads/4.3
Commit: 30dd76fc6540c307d5caa26ddb056f60a379cc80
Parents: f72eb94
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Jul 18 17:51:02 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:36:55 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30dd76fc/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 8bae584..d3f3946 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1797,6 +1797,11 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
Account owner = _accountMgr.getAccount(network.getAccountId());
+ // Only Admin can delete Shared networks
+ if (network.getGuestType() == GuestType.Shared && !_accountMgr.isAdmin(caller.getId())) {
+ throw new InvalidParameterValueException("Only Admins can delete network with guest type " + GuestType.Shared);
+ }
+
// Perform permission check
_accountMgr.checkAccess(caller, null, true, network);
[15/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails
(cherry picked from commit 16ab5ce76c68c2a6c813daec9cd2c90d4c5eb8c6)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/473cd6f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/473cd6f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/473cd6f0
Branch: refs/heads/4.3
Commit: 473cd6f09aad812d8fe61bcb8ad1d3571e5eb50b
Parents: 7b7eb48
Author: Kishan Kavala <ki...@cloud.com>
Authored: Thu Apr 10 14:41:52 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:19:14 2014 +0530
----------------------------------------------------------------------
.../lb/LoadBalancingRulesManagerImpl.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/473cd6f0/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index cdb38f0..6bc2da5 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -1061,7 +1061,10 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
applyLoadBalancerConfig(loadBalancerId);
success = true;
} catch (ResourceUnavailableException e) {
- if (isRollBackAllowedForProvider(loadBalancer)) {
+ s_logger.warn("Unable to apply the load balancer config because resource is unavaliable.", e);
+ success = false;
+ } finally {
+ if (!success) {
final List<Long> vmInstanceIds = new ArrayList<Long>();
Transaction.execute(new TransactionCallbackNoReturn() {
@Override
@@ -1078,17 +1081,14 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
}
loadBalancer.setState(backupState);
_lbDao.persist(loadBalancer);
+ CloudRuntimeException ex = new CloudRuntimeException("Failed to add specified loadbalancerruleid for vms "
+ + instanceIds);
+ ex.addProxyObject(loadBalancer.getUuid(), "loadBalancerId");
+ // TBD: Also pack in the instanceIds in the exception using the
+ // right VO object or table name.
+ throw ex;
}
- s_logger.warn("Unable to apply the load balancer config because resource is unavaliable.", e);
- }
- if (!success) {
- CloudRuntimeException ex = new CloudRuntimeException("Failed to add specified loadbalancerruleid for vms "
- + instanceIds);
- ex.addProxyObject(loadBalancer.getUuid(), "loadBalancerId");
- // TBD: Also pack in the instanceIds in the exception using the
- // right VO object or table name.
- throw ex;
}
return success;
[05/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance
(cherry picked from commit 522208dec2f81997c8b14d820c4f3f1be958ee44)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
server/src/com/cloud/template/TemplateManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8992e188
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8992e188
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8992e188
Branch: refs/heads/4.3
Commit: 8992e1883647aea65a22f69d7f514d0a7fab389b
Parents: bad40a7
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Wed Jun 11 16:33:00 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:50:03 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/template/TemplateManagerImpl.java | 3 ++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 11 ++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8992e188/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 7727061..3dd91f4 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1700,7 +1700,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
}
}
- if(cmd.getDetails() != null) {
+ if (cmd.getDetails() != null) {
+ details.remove("Encrypted.Password"); // new password will be generated during vm deployment from password enabled template
details.putAll(cmd.getDetails());
}
if( !details.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8992e188/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index a40af6e..e6390a0 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2989,6 +2989,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
hostName, diskOfferingId);
vm.setUuid(uuidName);
vm.setDynamicallyScalable(template.isDynamicallyScalable());
+
+ Map<String, String> details = template.getDetails();
+ if (details != null && !details.isEmpty()) {
+ vm.details.putAll(details);
+ }
+
if (sshPublicKey != null) {
vm.setDetail("SSH.PublicKey", sshPublicKey);
}
@@ -3038,11 +3044,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
}
- Map<String, String> details = template.getDetails();
- if ( details != null && !details.isEmpty() ) {
- vm.details.putAll(details);
- }
-
_vmDao.persist(vm);
if (customParameters != null && customParameters.size() > 0) {
for (String key : customParameters.keySet()) {
[18/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6328: added license header and removed white space
(cherry picked from commit d093a8a7b4a922773004fd501c3addde5f02810c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/192c7061
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/192c7061
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/192c7061
Branch: refs/heads/4.3
Commit: 192c70616457b93559cda64f26a537ea57da4c2e
Parents: 650464e
Author: Jayapal <ja...@apache.org>
Authored: Tue May 27 14:30:12 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:37:28 2014 +0530
----------------------------------------------------------------------
systemvm/scripts/run.sh | 2 +-
systemvm/scripts/utils.sh | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/192c7061/systemvm/scripts/run.sh
----------------------------------------------------------------------
diff --git a/systemvm/scripts/run.sh b/systemvm/scripts/run.sh
index b6a3a27..76e89a8 100755
--- a/systemvm/scripts/run.sh
+++ b/systemvm/scripts/run.sh
@@ -34,7 +34,7 @@ LOCKFILE=$LOCKDIR/$PROGNAME.xlock
lock $LOCKFILE $LOCKFD
if [ $? -eq 1 ];then
exit 1
-fi
+fi
while true
do
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/192c7061/systemvm/scripts/utils.sh
----------------------------------------------------------------------
diff --git a/systemvm/scripts/utils.sh b/systemvm/scripts/utils.sh
index 4d55fc7..bdd85f0 100644
--- a/systemvm/scripts/utils.sh
+++ b/systemvm/scripts/utils.sh
@@ -1,4 +1,21 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
CLOUDSTACK_HOME="/usr/local/cloud"
[06/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6783: Return a proper LibvirtStoragePool object after creating the pool
In situations where libvirt lost the storage pool the KVM Agent will re-create the
storage pool in libvirt.
This could be then libvirt is restarted for example.
The object returned internally was missing essential information like the sourceDir
aka the Ceph pool, the monitor IPs, cephx information and such.
In this case the first operation on this newly created pool would fail. All operations
afterwards would succeed.
(cherry picked from commit 48899e4c815dc2db7c714db08577d253bd5e2a09)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df7be282
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df7be282
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df7be282
Branch: refs/heads/4.3
Commit: df7be28266861a7f0d92fc3541d802d6edce5be7
Parents: 8992e18
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue May 27 16:18:25 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:53:53 2014 +0530
----------------------------------------------------------------------
.../hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df7be282/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 76659ec..2925b6f 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -545,6 +545,20 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
pool.setLocalPath("");
}
+ if (pool.getType() == StoragePoolType.RBD
+ || pool.getType() == StoragePoolType.Gluster) {
+ pool.setSourceHost(spd.getSourceHost());
+ pool.setSourcePort(spd.getSourcePort());
+ pool.setSourceDir(spd.getSourceDir());
+ String authUsername = spd.getAuthUserName();
+ if (authUsername != null) {
+ Secret secret = conn.secretLookupByUUIDString(spd.getSecretUUID());
+ String secretValue = new String(Base64.encodeBase64(secret.getByteValue()));
+ pool.setAuthUsername(authUsername);
+ pool.setAuthSecret(secretValue);
+ }
+ }
+
pool.setCapacity(sp.getInfo().capacity);
pool.setUsed(sp.getInfo().allocation);
pool.setAvailable(sp.getInfo().available);
[17/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones
Signed-off-by: Jayapal <ja...@apache.org>
(cherry picked from commit 96b1c6bf3cae3c03a872770ceb420c5daef21713)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/650464ed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/650464ed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/650464ed
Branch: refs/heads/4.3
Commit: 650464eda05d9e392ef7f99a6e08a6576de41ce7
Parents: 62ae768
Author: Saurav Lahiri <sa...@sungard.com>
Authored: Tue Apr 15 12:08:11 2014 +0000
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:37:13 2014 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/init.d/cloud | 14 ++++-----
systemvm/scripts/run.sh | 30 +++++++++++++++-----
systemvm/scripts/utils.sh | 21 ++++++++++++++
3 files changed, 50 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/650464ed/systemvm/patches/debian/config/etc/init.d/cloud
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud b/systemvm/patches/debian/config/etc/init.d/cloud
index 83853bc..b18b8b1 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud
+++ b/systemvm/patches/debian/config/etc/init.d/cloud
@@ -75,17 +75,15 @@ _failure() {
}
RETVAL=$?
CLOUDSTACK_HOME="/usr/local/cloud"
+if [ -f $CLOUDSTACK_HOME/systemvm/utils.sh ];
+then
+ . $CLOUDSTACK_HOME/systemvm/utils.sh
+else
+ _failure
+fi
# mkdir -p /var/log/vmops
-get_pids() {
- local i
- for i in $(ps -ef| grep java | grep -v grep | awk '{print $2}');
- do
- echo $(pwdx $i) | grep "$CLOUDSTACK_HOME" | awk -F: '{print $1}';
- done
-}
-
start() {
local pid=$(get_pids)
if [ "$pid" != "" ]; then
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/650464ed/systemvm/scripts/run.sh
----------------------------------------------------------------------
diff --git a/systemvm/scripts/run.sh b/systemvm/scripts/run.sh
index 146d96f..b6a3a27 100755
--- a/systemvm/scripts/run.sh
+++ b/systemvm/scripts/run.sh
@@ -23,15 +23,31 @@
#_run.sh runs the agent client.
# set -x
-
+readonly PROGNAME=$(basename "$0")
+readonly LOCKDIR=/tmp
+readonly LOCKFD=500
+
+CLOUDSTACK_HOME="/usr/local/cloud"
+. $CLOUDSTACK_HOME/systemvm/utils.sh
+
+LOCKFILE=$LOCKDIR/$PROGNAME.xlock
+lock $LOCKFILE $LOCKFD
+if [ $? -eq 1 ];then
+ exit 1
+fi
+
while true
do
- ./_run.sh "$@" &
- wait
- ex=$?
- if [ $ex -eq 0 ] || [ $ex -eq 1 ] || [ $ex -eq 66 ] || [ $ex -gt 128 ]; then
- # permanent errors
- sleep 5
+ pid=$(get_pids)
+ action=`cat /usr/local/cloud/systemvm/user_request`
+ if [ "$pid" == "" ] && [ "$action" == "start" ] ; then
+ ./_run.sh "$@" &
+ wait
+ ex=$?
+ if [ $ex -eq 0 ] || [ $ex -eq 1 ] || [ $ex -eq 66 ] || [ $ex -gt 128 ]; then
+ # permanent errors
+ sleep 5
+ fi
fi
# user stop agent by service cloud stop
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/650464ed/systemvm/scripts/utils.sh
----------------------------------------------------------------------
diff --git a/systemvm/scripts/utils.sh b/systemvm/scripts/utils.sh
new file mode 100644
index 0000000..4d55fc7
--- /dev/null
+++ b/systemvm/scripts/utils.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+CLOUDSTACK_HOME="/usr/local/cloud"
+
+get_pids() {
+ local i
+ for i in $(ps -ef| grep java | grep -v grep | awk '{print $2}');
+ do
+ echo $(pwdx $i) | grep "$CLOUDSTACK_HOME" | awk -F: '{print $1}';
+ done
+}
+
+lock()
+{
+ lockfile=$1
+ lockfd=$2
+ eval "exec $lockfd>$lockfile"
+ flock -n $lockfd\
+ && return 0 \
+ || return 1
+}
[03/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6989: Add 3 strikes rule for RvR freezing detection
Sometime in VR ntpd would move time backward to keep sync with NTP server, which
can result in false alarm of keepalived monitering process.
This patch adds 3 strikes for keepalived process dead detection to avoid falsely
shutdown keepalived process due to time adjustment for only once.
(cherry picked from commit 75c9a20c7773c268c02fb006d1a7820cb427c94c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f1dd864
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f1dd864
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f1dd864
Branch: refs/heads/4.3
Commit: 7f1dd86443d7ef55f4ce82b4174c17e00c545df9
Parents: 96e14f3
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Jun 24 16:58:55 2014 -0700
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:42:55 2014 +0530
----------------------------------------------------------------------
.../root/redundant_router/check_heartbeat.sh.templ | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f1dd864/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ b/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
index 95cabd6b..d6bdc5d 100755
--- a/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
+++ b/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
@@ -17,13 +17,28 @@
# under the License.
+STRIKE_FILE="[RROUTER_BIN_PATH]/keepalived.strikes"
+
if [ -e [RROUTER_BIN_PATH]/keepalived.ts2 ]
then
lasttime=$(cat [RROUTER_BIN_PATH]/keepalived.ts2)
thistime=$(cat [RROUTER_BIN_PATH]/keepalived.ts)
diff=$(($thistime - $lasttime))
+ s=0
if [ $diff -lt 30 ]
then
+ if [ -e $STRIKE_FILE ]
+ then
+ s=`cat $STRIKE_FILE 2>/dev/null`
+ fi
+ s=$(($s+1))
+ echo $s > $STRIKE_FILE
+ else
+ rm $STRIKE_FILE
+ fi
+ #3 strikes rule
+ if [ $s -gt 2 ]
+ then
echo Keepalived process is dead! >> [RROUTER_LOG]
[RROUTER_BIN_PATH]/services.sh stop >> [RROUTER_LOG] 2>&1
[RROUTER_BIN_PATH]/disable_pubip.sh >> [RROUTER_LOG] 2>&1
[02/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6996 Adding cluster to legacy zone failed
Lookup zone_id field in legacy_zones table to search the table for legacy zone.
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
(cherry picked from commit 71f76edf71d155e14500f222d81c82ce03397dbf)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/96e14f30
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/96e14f30
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/96e14f30
Branch: refs/heads/4.3
Commit: 96e14f309ea71b212e4ad99b402c289c819d4dc9
Parents: 30dd76f
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Fri Jun 27 14:01:39 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:42:13 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java | 2 +-
.../src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 6 +++---
.../com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96e14f30/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
index 290f1af..882084b 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDao.java
@@ -27,7 +27,7 @@ public interface LegacyZoneDao extends GenericDao<LegacyZoneVO, Long> {
* @param zoneId - id of zone
* @return Object of legacy zone (LegacyZoneVO) identified by zoneId
*/
- LegacyZoneVO findByZoneId(String zoneId);
+ LegacyZoneVO findByZoneId(Long zoneId);
/**
* Lists all legacy CloudStack zones
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96e14f30/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
index 20d68b0..dc121a1 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java
@@ -51,16 +51,16 @@
}
@Override
- public LegacyZoneVO findByZoneId(String zoneId) {
+ public LegacyZoneVO findByZoneId(Long zoneId) {
SearchCriteria<LegacyZoneVO> sc = zoneSearch.create();
sc.setParameters("zoneId", zoneId);
return findOneBy(sc);
}
@Override
- public List<LegacyZoneVO> listAllLegacyZones() {
+ public List<LegacyZoneVO> listAllLegacyZones() {
SearchCriteria<LegacyZoneVO> sc = fullTableSearch.create();
return search(sc, null);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/96e14f30/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 028fa94..ce794b1 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -1240,7 +1240,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
@Override
public boolean isLegacyZone(long dcId) {
boolean isLegacyZone = false;
- LegacyZoneVO legacyZoneVo = _legacyZoneDao.findById(dcId);
+ LegacyZoneVO legacyZoneVo = _legacyZoneDao.findByZoneId(dcId);
if (legacyZoneVo != null) {
isLegacyZone = true;
}
[19/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name".
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit 085911f0a6c256c5f2a439ec0bf79b5027cdc078)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df6172f9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df6172f9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df6172f9
Branch: refs/heads/4.3
Commit: df6172f93846455bb3eba2930bdfcce52dc21104
Parents: 192c706
Author: Sachchidanand Vaidya <va...@juniper.net>
Authored: Wed Apr 2 01:57:07 2014 -0700
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:42:28 2014 +0530
----------------------------------------------------------------------
.../contrail/api/command/CreateServiceInstanceCmd.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df6172f9/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
index 62ab317..9d0e942 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java
@@ -90,7 +90,8 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd {
description = "The service offering ID that defines the resources consumed by the service appliance")
private Long serviceOfferingId;
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING)
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING,
+ required = true, description = "The name of the service instance")
private String name;
/// Implementation
@@ -126,6 +127,10 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd {
throw new InvalidParameterValueException("Invalid ID for right network " + rightNetworkId);
}
+ if (name.isEmpty()) {
+ throw new InvalidParameterValueException("service instance name is empty");
+ }
+
ServiceVirtualMachine svm = _vrouterService.createServiceInstance(zone, owner, template, serviceOffering,
name, left, right);
if (svm == null) {
[09/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6578: Fixed issue in delete remote access vpn command
(cherry picked from commit 40836344de54091d795817f41a4fa136ecdb0f5d)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dddc6488
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dddc6488
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dddc6488
Branch: refs/heads/4.3
Commit: dddc6488d45e1faca958326c252b36ece412bc84
Parents: 6ad3ae7
Author: Jayapal <ja...@apache.org>
Authored: Mon May 5 13:56:59 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:08:44 2014 +0530
----------------------------------------------------------------------
.../cloud/network/vpn/RemoteAccessVpnService.java | 4 +++-
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 6 +++++-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 15 ++++++++++++---
3 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dddc6488/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
index de7692d..ef5bd2b 100644
--- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
+++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -33,7 +33,9 @@ public interface RemoteAccessVpnService {
RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall)
throws NetworkRuleConflictException;
- void destroyRemoteAccessVpnForIp(long vpnServerAddressId, Account caller) throws ResourceUnavailableException;
+
+ boolean destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException;
+
RemoteAccessVpn startRemoteAccessVpn(long vpnServerAddressId, boolean openFirewall) throws ResourceUnavailableException;
VpnUser addVpnUser(long vpnOwnerId, String userName, String password);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dddc6488/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
index 640a89a..fdd3c10 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
@@ -18,6 +18,8 @@ package org.apache.cloudstack.api.command.user.vpn;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
@@ -85,7 +87,9 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException {
- _ravService.destroyRemoteAccessVpnForIp(publicIpId, CallContext.current().getCallingAccount());
+ if (! _ravService.destroyRemoteAccessVpnForIp(publicIpId, CallContext.current().getCallingAccount())) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete remote access vpn");
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dddc6488/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index c7e67c1..0acb0a2 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -261,16 +261,18 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
}
}
- @Override @DB
- public void destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {
+ @Override
+ @DB
+ public boolean destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {
final RemoteAccessVpnVO vpn = _remoteAccessVpnDao.findByPublicIpAddress(ipId);
if (vpn == null) {
s_logger.debug("there are no Remote access vpns for public ip address id=" + ipId);
- return;
+ return true;
}
_accountMgr.checkAccess(caller, null, true, vpn);
+ RemoteAccessVpn.State prevState = vpn.getState();
vpn.setState(RemoteAccessVpn.State.Removed);
_remoteAccessVpnDao.update(vpn.getId(), vpn);
@@ -282,6 +284,12 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
break;
}
}
+ }catch (ResourceUnavailableException ex) {
+ vpn.setState(prevState);
+ _remoteAccessVpnDao.update(vpn.getId(), vpn);
+ s_logger.debug("Failed to stop the vpn " + vpn.getId() + " , so reverted state to "+
+ RemoteAccessVpn.State.Running);
+ success = false;
} finally {
if (success) {
//Cleanup corresponding ports
@@ -342,6 +350,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
}
}
}
+ return success;
}
@Override
[07/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6714: monitor script echo service command is added with quotes
(cherry picked from commit 6052a181ddddd7ca5f7c425d56d3eca55fba4aa5)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd77e702
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd77e702
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd77e702
Branch: refs/heads/4.3
Commit: cd77e702cfa5767b6c3d8f3eec8293ba800ae607
Parents: df7be28
Author: Jayapal <ja...@apache.org>
Authored: Tue May 20 11:11:15 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:55:18 2014 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd77e702/systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh b/systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh
index 809c5b7..6741c47 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh
@@ -45,7 +45,7 @@ processname=$(echo $s | cut -d: -f2);
service_name=$(echo $s | cut -d: -f3);
pidfile=$(echo $s | cut -d: -f4);
-echo $service >> $configFile;
+echo "$service" >> $configFile;
echo $processname >> $configFile
echo $service_name >> $configFile
echo $pidfile >> $configFile
[16/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus
with this fix, virtual host on the AMQP server can be specified. Also
SSL can be used for connection between management server and AMQP
servers.
(cherry picked from commit bc17f177760b3b61f1df7ed9728738ffe64896d5)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62ae7685
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62ae7685
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62ae7685
Branch: refs/heads/4.3
Commit: 62ae768540c451c098fb2dd90d718add7d822c4c
Parents: 473cd6f
Author: Murali Reddy <mu...@gmail.com>
Authored: Wed Apr 9 17:32:16 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:21:23 2014 +0530
----------------------------------------------------------------------
.../mom/rabbitmq/RabbitMQEventBus.java | 29 +++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62ae7685/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
index 478c8d7..30b4475 100644
--- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
+++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
@@ -48,6 +48,18 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus {
private static String username;
private static String password;
+ public static void setVirtualHost(String virtualHost) {
+ RabbitMQEventBus.virtualHost = virtualHost;
+ }
+
+ private static String virtualHost;
+
+ public static void setUseSsl(String useSsl) {
+ RabbitMQEventBus.useSsl = useSsl;
+ }
+
+ private static String useSsl;
+
// AMQP exchange name where all CloudStack events will be published
private static String amqpExchangeName;
@@ -92,6 +104,12 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus {
throw new ConfigurationException("Unable to get the port details of AMQP server");
}
+ if (useSsl != null && !useSsl.isEmpty()) {
+ if (!useSsl.equalsIgnoreCase("true") && !useSsl.equalsIgnoreCase("false")) {
+ throw new ConfigurationException("Invalid configuration parameter for 'ssl'.");
+ }
+ }
+
if (retryInterval == null) {
retryInterval = 10000;// default to 10s to try out reconnect
}
@@ -341,9 +359,18 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus {
ConnectionFactory factory = new ConnectionFactory();
factory.setUsername(username);
factory.setPassword(password);
- factory.setVirtualHost("/");
factory.setHost(amqpHost);
factory.setPort(port);
+
+ if (virtualHost != null && !virtualHost.isEmpty()) {
+ factory.setVirtualHost(virtualHost);
+ } else {
+ factory.setVirtualHost("/");
+ }
+
+ if (useSsl != null && !useSsl.isEmpty() && useSsl.equalsIgnoreCase("true")) {
+ factory.useSslProtocol();
+ }
Connection connection = factory.newConnection();
connection.addShutdownListener(disconnectHandler);
_connection = connection;
[13/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting
modified: server/src/com/cloud/api/ApiDBUtils.java
Signed-off-by: Daan Hoogland <da...@onecht.net>
(cherry picked from commit 601827e6b34cb7debe67a8415a09440c389ba4a1)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ac44896
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ac44896
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ac44896
Branch: refs/heads/4.3
Commit: 5ac44896c8ad2e5838f91b841d9d041790d17775
Parents: af79d6a
Author: Tanner Danzey <ar...@gmail.com>
Authored: Mon Apr 14 16:52:05 2014 -0500
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:17:09 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/ApiDBUtils.java | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ac44896/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 2617097..1df872e 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -19,6 +19,7 @@ package com.cloud.api;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
@@ -233,6 +234,7 @@ import com.cloud.storage.ImageStore;
import com.cloud.storage.Snapshot;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StorageManager;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StorageStats;
@@ -969,6 +971,26 @@ public class ApiDBUtils {
if (xenClusters.isEmpty()) {
type = HypervisorType.Hyperv;
}
+ } if (format == ImageFormat.RAW) {
+ // Currently, KVM only suppoorts RBD images of type RAW.
+ // This results in a weird collision with OVM volumes which
+ // can only be raw, thus making KVM RBD volumes show up as OVM
+ // rather than RBD. This block of code can (hopefuly) by checking to
+ // see if the pool is using either RBD or NFS. However, it isn't
+ // quite clear what to do if both storage types are used. If the image
+ // format is RAW, it narrows the hypervisor choice down to OVM and KVM / RBD or KVM / CLVM
+ // This would be better implemented at a cluster level.
+ List<StoragePoolVO> pools = s_storagePoolDao.listByDataCenterId(dcId);
+ ListIterator<StoragePoolVO> itr = pools.listIterator();
+ while(itr.hasNext()) {
+ StoragePoolVO pool = itr.next();
+ if(pool.getPoolType() == StoragePoolType.RBD || pool.getPoolType() == StoragePoolType.CLVM) {
+ // This case will note the presence of non-qcow2 primary stores, suggesting KVM without NFS. Otherwse,
+ // If this check is not passed, the hypervisor type will remain OVM.
+ type = HypervisorType.KVM;
+ break;
+ }
+ }
}
return type;
}
[12/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6467: Add pre/post-state transition status to messages published on
... event bus by UserVmStateListener. Allow system VM resource state
post-transitions to be published.
(cherry picked from commit 9c4de764f74bffd5cd547f8514d4a6897fb961c2)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
server/src/com/cloud/vm/UserVmStateListener.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af79d6aa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af79d6aa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af79d6aa
Branch: refs/heads/4.3
Commit: af79d6aaf7b2305e4032f01ed0fe7dff2a01fee3
Parents: 7e5c7d4
Author: jeff <je...@greenqloud.com>
Authored: Mon Apr 21 14:47:12 2014 +0000
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:16:01 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/vm/UserVmStateListener.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af79d6aa/server/src/com/cloud/vm/UserVmStateListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java
index f783ffa..213ff8a 100644
--- a/server/src/com/cloud/vm/UserVmStateListener.java
+++ b/server/src/com/cloud/vm/UserVmStateListener.java
@@ -72,12 +72,12 @@ public class UserVmStateListener implements StateListener<State, VirtualMachine.
if(!status){
return false;
}
-
- if(vo.getType() != VirtualMachine.Type.User){
+
+ pubishOnEventBus(event.name(), "postStateTransitionEvent", vo, oldState, newState);
+
+ if (vo.getType() != VirtualMachine.Type.User) {
return true;
}
-
- pubishOnEventBus(event.name(), "postStateTransitionEvent", vo, oldState, newState);
if (VirtualMachine.State.isVmCreated(oldState, event, newState)) {
generateUsageEvent(vo.getServiceOfferingId(), vo, EventTypes.EVENT_VM_CREATE);
@@ -135,6 +135,7 @@ public class UserVmStateListener implements StateListener<State, VirtualMachine.
eventDescription.put("id", vo.getUuid());
eventDescription.put("old-state", oldState.name());
eventDescription.put("new-state", newState.name());
+ eventDescription.put("status", status);
String eventDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").format(new Date());
eventDescription.put("eventDateTime", eventDate);
[08/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
add conntrackd logrotate for systemvms, dont start conntrackd on logrotate if it isnt running
(cherry picked from commit df4a21ae3dbb8bd4dad0bdb759990e9b90a9dc09)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ad3ae78
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ad3ae78
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ad3ae78
Branch: refs/heads/4.3
Commit: 6ad3ae78e4695440cc347c50726672a5133d8faf
Parents: cd77e70
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Sat Apr 5 00:30:28 2014 -0600
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:02:52 2014 +0530
----------------------------------------------------------------------
.../patches/debian/config/etc/logrotate.d/conntrackd | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ad3ae78/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
new file mode 100644
index 0000000..d09d752
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
@@ -0,0 +1,13 @@
+/var/log/conntrackd-stats.log {
+ daily
+ rotate 2
+ missingok
+ compress
+ delaycompress
+
+ postrotate
+ if [ -e /var/run/conntrackd.sock ]; then
+ invoke-rc.d conntrackd restart > /dev/null
+ fi
+ endscript
+}
[10/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6577: Disable service monitoring in RVR
(cherry picked from commit b9b623bccc6819f4a8f96054c51ecc5d3f1db944)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fac57a0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fac57a0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fac57a0a
Branch: refs/heads/4.3
Commit: fac57a0a837a2d8a291029ed99479796c8d625c9
Parents: dddc648
Author: Jayapal <ja...@apache.org>
Authored: Mon May 5 13:45:51 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:10:27 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fac57a0a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index b0e1228..f3c6ffa 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2372,20 +2372,24 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
if (reprogramGuestNtwks) {
finalizeIpAssocForNetwork(cmds, router, provider, guestNetworkId, null);
finalizeNetworkRulesForNetwork(cmds, router, provider, guestNetworkId);
- }
- finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId);
- }
+ NetworkOffering offering = _networkOfferingDao.findById((_networkDao.findById(guestNetworkId)).getNetworkOfferingId());
+ //service monitoring is currently not added in RVR
+ if (!offering.getRedundantRouter()) {
+ String serviceMonitringSet = _configDao.getValue(Config.EnableServiceMonitoring.key());
+
+ if (serviceMonitringSet != null && serviceMonitringSet.equalsIgnoreCase("true")) {
+ finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, true);
+ } else {
+ finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, false);
+ }
+ }
- String serviceMonitringSet = _configDao.getValue(Config.EnableServiceMonitoring.key());
+ }
- if (serviceMonitringSet != null && serviceMonitringSet.equalsIgnoreCase("true")) {
- finalizeMonitorServiceOnStrat(cmds, profile, router, provider, routerGuestNtwkIds.get(0), true);
- } else {
- finalizeMonitorServiceOnStrat(cmds, profile, router, provider, routerGuestNtwkIds.get(0), false);
+ finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId);
}
-
return true;
}
[04/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary
This new way would only enable IPv6 when VR is created in IPv6 shared network.
Otherwise IPv6 sysctl options remain disable.
(cherry picked from commit c181485ae596f49d9dfd8b78f4184ab7fcad6a8a)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bad40a74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bad40a74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bad40a74
Branch: refs/heads/4.3
Commit: bad40a74812c929ca643accaa6485516a5e0b309
Parents: 7f1dd86
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jun 13 11:05:35 2014 -0700
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 22:45:58 2014 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 1 +
systemvm/patches/debian/config/etc/sysctl.conf | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bad40a74/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 4783ec2..8cc927f 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -387,6 +387,7 @@ setup_interface() {
setup_interface_ipv6() {
sysctl net.ipv6.conf.all.disable_ipv6=0
+ sysctl net.ipv6.conf.all.forwarding=1
sysctl net.ipv6.conf.all.accept_ra=1
local intfnum=$1
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bad40a74/systemvm/patches/debian/config/etc/sysctl.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/sysctl.conf b/systemvm/patches/debian/config/etc/sysctl.conf
index d15276a..1ba1282 100644
--- a/systemvm/patches/debian/config/etc/sysctl.conf
+++ b/systemvm/patches/debian/config/etc/sysctl.conf
@@ -51,8 +51,8 @@ net.nf_conntrack_max = 1000000
net.netfilter.nf_conntrack_max = 1000000
# Disable IPv6
-net.ipv6.conf.all.disable_ipv6 = 0
-net.ipv6.conf.all.forwarding = 1
-net.ipv6.conf.all.accept_ra = 1
+net.ipv6.conf.all.disable_ipv6 = 1
+net.ipv6.conf.all.forwarding = 0
+net.ipv6.conf.all.accept_ra = 0
net.ipv6.conf.all.accept_redirects = 0
net.ipv6.conf.all.autoconf = 0
[20/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CHANGES: updates changes files, fix cherry-picked commits that break semantics
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67df5b9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67df5b9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67df5b9d
Branch: refs/heads/4.3
Commit: 67df5b9dadfb7f524576edfe001b558b9123f5a0
Parents: df6172f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 26 00:34:14 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 26 00:34:14 2014 +0530
----------------------------------------------------------------------
CHANGES.md | 19 ++++++++++++++++++-
.../kvm/storage/LibvirtStorageAdaptor.java | 3 +--
server/src/com/cloud/api/ApiDBUtils.java | 2 +-
.../com/cloud/network/NetworkServiceImpl.java | 2 +-
4 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index b501195..1399abc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -66,8 +66,25 @@ This is a bug fix release. The following issues were fixed:
CLOUDSTACK-7319: dd with direct io is less impacting on Dom0 kernel resources
CLOUDSTACK-7302: UI: Remove Hover Interaction from breadcrumbs at top page
CLOUDSTACK-7293: UI: Fixed localization issues on the login page
- CLOUDSTACK-7191:On restartNetwork destroy the VR immediatley, instead of cleanup the rules then destroy
+ CLOUDSTACK-7191: On restartNetwork destroy the VR immediatley, instead of cleanup the rules then destroy
CLOUDSTACK-7144: No GSLB provider is available during assigning load balancing rule
+ CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared networks
+ CLOUDSTACK-6996: Adding cluster to legacy zone failed
+ CLOUDSTACK-6989: Add 3 strikes rule for RvR freezing detection
+ CLOUDSTACK-6908: Enable IPv6 in sysctl when only necessary
+ CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance
+ CLOUDSTACK-6783: Return a proper LibvirtStoragePool object after creating the pool
+ CLOUDSTACK-6714: monitor script echo service command is added with quotes
+ CLOUDSTACK-6578: Fixed issue in delete remote access vpn command
+ CLOUDSTACK-6577: Disable service monitoring in RVR
+ CLOUDSTACK-6516: In 4.3, SSL was turned off by default.
+ CLOUDSTACK-6467: Add pre/post-state transition status to messages published on
+ CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting
+ CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
+ CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails
+ CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus
+ CLOUDSTACK-6328: run.sh check if an existing java process is running, before spawining new ones
+ CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name".
Version 4.3.1
-------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 2925b6f..768073e 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -545,8 +545,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
pool.setLocalPath("");
}
- if (pool.getType() == StoragePoolType.RBD
- || pool.getType() == StoragePoolType.Gluster) {
+ if (pool.getType() == StoragePoolType.RBD) {
pool.setSourceHost(spd.getSourceHost());
pool.setSourcePort(spd.getSourcePort());
pool.setSourceDir(spd.getSourceDir());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 1df872e..54db329 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -980,7 +980,7 @@ public class ApiDBUtils {
// quite clear what to do if both storage types are used. If the image
// format is RAW, it narrows the hypervisor choice down to OVM and KVM / RBD or KVM / CLVM
// This would be better implemented at a cluster level.
- List<StoragePoolVO> pools = s_storagePoolDao.listByDataCenterId(dcId);
+ List<StoragePoolVO> pools = _storagePoolDao.listByDataCenterId(dcId);
ListIterator<StoragePoolVO> itr = pools.listIterator();
while(itr.hasNext()) {
StoragePoolVO pool = itr.next();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67df5b9d/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 d3f3946..767d2b1 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1798,7 +1798,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
Account owner = _accountMgr.getAccount(network.getAccountId());
// Only Admin can delete Shared networks
- if (network.getGuestType() == GuestType.Shared && !_accountMgr.isAdmin(caller.getId())) {
+ if (network.getGuestType() == GuestType.Shared && !_accountMgr.isAdmin(caller.getType())) {
throw new InvalidParameterValueException("Only Admins can delete network with guest type " + GuestType.Shared);
}
[11/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6516: In 4.3, SSL was turned off by default.
However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.
Local testing, checking a fresh install has the above property false by default.
Signed-off-by: Nitin Mehta<ni...@citrix.com>
(cherry picked from commit 05802004e27f91f4c23274ca123f1ecf9fde5ac2)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e5c7d48
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e5c7d48
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e5c7d48
Branch: refs/heads/4.3
Commit: 7e5c7d488ab60fdab48d51dd6921912607f4f100
Parents: fac57a0
Author: Amogh Vasekar <am...@citrix.com>
Authored: Fri Apr 25 14:48:15 2014 -0700
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:12:59 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e5c7d48/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index c204b4d..358e0db 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -201,8 +201,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
_configDao.update(Config.UseSecondaryStorageVm.key(), Config.UseSecondaryStorageVm.getCategory(), "true");
s_logger.debug("ConfigurationServer made secondary storage vm required.");
- _configDao.update(Config.SecStorageEncryptCopy.key(), Config.SecStorageEncryptCopy.getCategory(), "true");
- s_logger.debug("ConfigurationServer made secondary storage copy encrypted.");
+ _configDao.update(Config.SecStorageEncryptCopy.key(), Config.SecStorageEncryptCopy.getCategory(), "false");
+ s_logger.debug("ConfigurationServer made secondary storage copy encrypt set to false.");
_configDao.update("secstorage.secure.copy.cert", "realhostip");
s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");
[14/20] git commit: updated refs/heads/4.3 to 67df5b9
Posted by bh...@apache.org.
CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
(cherry picked from commit 26746feb39da6483059be7b33a2d5cd41f042c78)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b7eb482
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b7eb482
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b7eb482
Branch: refs/heads/4.3
Commit: 7b7eb48281ed79dab7cabb512554b05ec7ae6da2
Parents: 5ac4489
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue Mar 4 11:18:09 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 25 23:17:58 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7eb482/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index 37f1c39..28d8776 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -515,6 +515,11 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
if (networkId != null) {
Network network = _networkDao.findById(networkId);
aclId = network.getNetworkACLId();
+ if( aclId == null){
+ // No aclId associated with the network.
+ //Return empty list
+ return new Pair(new ArrayList<NetworkACLItem>(), 0);
+ }
}
if (trafficType != null) {