date:20150304

cloudstack-docs-admin git commit: fix storage section typo

2015-03-04 Thread sebgoa

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/master 162c74614 -> 61b990ee0


fix storage section typo

Signed-off-by: Sebastien Goasguen 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/61b990ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/61b990ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/61b990ee

Branch: refs/heads/master
Commit: 61b990ee0f51f534f1ccbe722e08ccd8acb477ab
Parents: 162c746
Author: Satoru Nakaya 
Authored: Wed Mar 4 16:25:30 2015 +0900
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 03:51:51 2015 -0500

--
 source/storage.rst | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/61b990ee/source/storage.rst
--
diff --git a/source/storage.rst b/source/storage.rst
index 83ac5cb..df260b1 100644
--- a/source/storage.rst
+++ b/source/storage.rst
@@ -215,9 +215,12 @@ hypervisor type may not be used on a guest of another 
hypervisor type.
 
 .. note:: 
CloudStack supports attaching up to
+
- 13 data disks on XenServer hypervisor versions 6.0 and above,
  And all versions of VMware.
+
- 64 data disks on Hyper-V.
+
- 6 data disks on other hypervisor types.

[40/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge remote-tracking branch 'laszlo/CLOUDSTACK-8294'

This closes #92

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db443c17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db443c17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db443c17

Branch: refs/heads/reporter
Commit: db443c1734c738ebd265259264ed7be5502fb246
Parents: 541c23e 873649e
Author: Rohit Yadav 
Authored: Mon Mar 2 16:36:27 2015 +0530
Committer: Rohit Yadav 
Committed: Mon Mar 2 16:36:39 2015 +0530

--
 .../cloud/network/nicira/NiciraNvpApiTest.java  | 21 ++--
 1 file changed, 19 insertions(+), 2 deletions(-)
--

[48/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

kvm: Check the return value of the cloudstack-setup-agent command

Bug-Url: https://issues.apache.org/jira/browse/CLOUDSTACK-8016
Signed-off-by: Laszlo Hornyak 
Signed-off-by: Rajani Karuturi 

This closes #93


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c1590ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c1590ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c1590ff

Branch: refs/heads/reporter
Commit: 7c1590ffd67b74f52fe374b0fb91f8c1ef731c39
Parents: 619f014
Author: Laszlo Hornyak 
Authored: Sat Jan 17 22:09:16 2015 +0100
Committer: Rajani Karuturi 
Committed: Wed Mar 4 12:42:14 2015 +0530

--
 .../hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java| 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c1590ff/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
--
diff --git 
a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java 
b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
index d475f4d..350b9a7 100644
--- 
a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
+++ 
b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -205,7 +205,12 @@ public abstract class LibvirtServerDiscoverer extends 
DiscovererBase implements
 parameters += " --guestNic=" + kvmGuestNic;
 parameters += " --hypervisor=" + 
cluster.getHypervisorType().toString().toLowerCase();
 
-SSHCmdHelper.sshExecuteCmd(sshConnection, "cloudstack-setup-agent 
" + parameters, 3);
+if (!SSHCmdHelper.sshExecuteCmd(sshConnection,
+"cloudstack-setup-agent " + parameters, 3)) {
+s_logger.info("cloudstack agent setup command failed: "
++ "cloudstack-setup-agent " + parameters);
+return null;
+}
 
 KvmDummyResourceBase kvmResource = new KvmDummyResourceBase();
 Map params = new HashMap();

[12/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3931993/test/integration/component/test_shared_networks.py
--
diff --git a/test/integration/component/test_shared_networks.py 
b/test/integration/component/test_shared_networks.py
index 4d71ed3..4492a3e 100644
--- a/test/integration/component/test_shared_networks.py
+++ b/test/integration/component/test_shared_networks.py
@@ -17,139 +17,140 @@
 
 """ P1 tests for shared networks
 """
-# Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.lib.base import (Account,
- Network,
- NetworkOffering,
- VirtualMachine,
- Project,
- PhysicalNetwork,
- Domain,
- StaticNATRule,
- FireWallRule,
- ServiceOffering,
- PublicIPAddress)
+ Network,
+ NetworkOffering,
+ VirtualMachine,
+ Project,
+ PhysicalNetwork,
+ Domain,
+ StaticNATRule,
+ FireWallRule,
+ ServiceOffering,
+ PublicIPAddress)
 from marvin.lib.utils import (cleanup_resources,
-  validateList,
-  xsplit)
+  validateList)
 from marvin.lib.common import (get_domain,
-   get_zone,
-   get_template,
-   wait_for_cleanup,
-   get_free_vlan)
-from marvin.codes import *
+   get_zone,
+   get_template,
+   wait_for_cleanup,
+   get_free_vlan)
+from marvin.codes import PASS
 import random
 import netaddr
 
+
 class Services:
+
 """ Test shared networks """
 
 def __init__(self):
 self.services = {
-  "domain": {
-   "name": "DOM",
-   },
- "project": {
-"name": "Project",
-"displaytext": "Test project",
-},
- "account": {
-"email": "admin-xa...@test.com",
-"firstname": "admin-XABU1",
-"lastname": "admin-XABU1",
-"username": "admin-XABU1",
-# Random characters are appended for unique
-# username
-"password": "password",
-},
- "service_offering": {
-"name": "Tiny Instance",
-"displaytext": "Tiny Instance",
-"cpunumber": 1,
-"cpuspeed": 100,  # in MHz
-"memory": 128,  # In MBs
-},
- "network_offering": {
-"name": 'MySharedOffering',
-"displaytext": 'MySharedOffering',
-"guestiptype": 'Shared',
-"supportedservices": 'Dhcp,Dns,UserData',
-"specifyVlan" : "False",
-"specifyIpRanges" : "False",
-"traffictype": 'GUEST',
-"serviceProviderList" : {
-"Dhcp": 'VirtualRouter',
-"Dns": 'VirtualRouter',
-"UserData": 'VirtualRouter'
-},
-},
- "network": {
-  "name": "MySharedNetwork - Test",
-  "displaytext": "MySharedNetwork",
-  "gateway" :"",
-  "netmask" :"255.255.255.0",
-

[03/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Update messages.properties

Instances ca be scaled up or down, no only up.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81378c49
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81378c49
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81378c49

Branch: refs/heads/reporter
Commit: 81378c49de0143c6b9c4b2c145c8884b5bf6b93e
Parents: 09e26c8
Author: NuxRo 
Authored: Mon Feb 23 16:01:42 2015 +
Committer: NuxRo 
Committed: Mon Feb 23 16:01:42 2015 +

--
 client/WEB-INF/classes/resources/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81378c49/client/WEB-INF/classes/resources/messages.properties
--
diff --git a/client/WEB-INF/classes/resources/messages.properties 
b/client/WEB-INF/classes/resources/messages.properties
index b46be06..a4e4e1a 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1322,7 +1322,7 @@ label.remove.vpc.offering=Remove VPC offering
 label.vpc.distributedvpcrouter=Distributed VPC Router
 label.vpc.supportsregionlevelvpc=Supports Region Level VPC
 label.dynamically.scalable=Dynamically Scalable
-label.instance.scaled.up=Instance Scaled Up
+label.instance.scaled.up=Instance Scaled
 label.tag.key=Tag Key
 label.tag.value=Tag Value
 label.ipv6.address=IPv6 IP Address

[39/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge remote-tracking branch 'laszlo/CLOUDSTACK-8279'

This closes #90

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/541c23ed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/541c23ed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/541c23ed

Branch: refs/heads/reporter
Commit: 541c23ed07ffee30861926a2d0e84ddf0f3b9ef4
Parents: 62e179b df11bb2
Author: Rohit Yadav 
Authored: Mon Mar 2 16:35:27 2015 +0530
Committer: Rohit Yadav 
Committed: Mon Mar 2 16:35:36 2015 +0530

--
 .../api/routing/SetFirewallRulesCommand.java|   4 +-
 .../VirtualRoutingResourceTest.java | 212 +++
 2 files changed, 124 insertions(+), 92 deletions(-)
--

[23/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

plugins: fix version to fix build

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8829a0d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8829a0d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8829a0d4

Branch: refs/heads/reporter
Commit: 8829a0d4a7f396549af9ce6071c75eac86ae0bfe
Parents: a75ff23
Author: Rohit Yadav 
Authored: Fri Feb 27 16:20:27 2015 +0530
Committer: Rohit Yadav 
Committed: Fri Feb 27 16:20:27 2015 +0530

--
 plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8829a0d4/plugins/user-authenticators/pbkdf2/pom.xml
--
diff --git a/plugins/user-authenticators/pbkdf2/pom.xml 
b/plugins/user-authenticators/pbkdf2/pom.xml
index e656045..f085003 100644
--- a/plugins/user-authenticators/pbkdf2/pom.xml
+++ b/plugins/user-authenticators/pbkdf2/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.cloudstack
 cloudstack-plugins
-4.5.0-SNAPSHOT
+4.6.0-SNAPSHOT
 ../../pom.xml

[08/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Update messages.properties

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f06dc56e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f06dc56e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f06dc56e

Branch: refs/heads/reporter
Commit: f06dc56e6ac886bebe340913b0ad5873466ac6df
Parents: 81378c4
Author: NuxRo 
Authored: Wed Feb 25 10:31:57 2015 +
Committer: NuxRo 
Committed: Wed Feb 25 10:31:57 2015 +

--
 client/WEB-INF/classes/resources/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f06dc56e/client/WEB-INF/classes/resources/messages.properties
--
diff --git a/client/WEB-INF/classes/resources/messages.properties 
b/client/WEB-INF/classes/resources/messages.properties
index a4e4e1a..553bfc6 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1322,7 +1322,7 @@ label.remove.vpc.offering=Remove VPC offering
 label.vpc.distributedvpcrouter=Distributed VPC Router
 label.vpc.supportsregionlevelvpc=Supports Region Level VPC
 label.dynamically.scalable=Dynamically Scalable
-label.instance.scaled.up=Instance Scaled
+label.instance.scaled.up=Instance scaled to the requested offering
 label.tag.key=Tag Key
 label.tag.value=Tag Value
 label.ipv6.address=IPv6 IP Address

[01/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Repository: cloudstack
Updated Branches:
  refs/heads/reporter b26f3fcb0 -> 178a938ca (forced update)


packaging for fedora 21

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a9912a00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a9912a00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a9912a00

Branch: refs/heads/reporter
Commit: a9912a00b8f803f04c11821aa4d7a309b40fc079
Parents: 7319f25
Author: Laszlo Hornyak 
Authored: Sat Feb 21 22:44:40 2015 +0100
Committer: Laszlo Hornyak 
Committed: Sat Feb 21 22:44:40 2015 +0100

--
 packaging/fedora21/cloud-agent.rc | 117 
 packaging/fedora21/cloud-ipallocator.rc   |  96 +++
 packaging/fedora21/cloud-management.rc| 115 
 packaging/fedora21/cloud-management.sysconfig |  23 +
 packaging/fedora21/cloud-usage.rc | 156 +
 packaging/fedora21/cloud.spec | 706 +
 packaging/fedora21/cloudstack-agent.te|  33 +
 packaging/fedora21/cloudstack-sccs|  20 +
 packaging/fedora21/replace.properties |  60 ++
 packaging/fedora21/tomcat.sh  |  18 +
 10 files changed, 1344 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9912a00/packaging/fedora21/cloud-agent.rc
--
diff --git a/packaging/fedora21/cloud-agent.rc 
b/packaging/fedora21/cloud-agent.rc
new file mode 100755
index 000..6cc6abc
--- /dev/null
+++ b/packaging/fedora21/cloud-agent.rc
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# chkconfig: 35 99 10
+# description: Cloud Agent
+
+# 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.
+
+# WARNING: if this script is changed, then all other initscripts MUST BE 
changed to match it as well
+
+. /etc/rc.d/init.d/functions
+
+# set environment variables
+
+SHORTNAME=$(basename $0 | sed -e 's/^[SK][0-9][0-9]//')
+PIDFILE=/var/run/"$SHORTNAME".pid
+LOCKFILE=/var/lock/subsys/"$SHORTNAME"
+LOGDIR=/var/log/cloudstack/agent
+LOGFILE=${LOGDIR}/agent.log
+PROGNAME="Cloud Agent"
+CLASS="com.cloud.agent.AgentShell"
+JSVC=`which jsvc 2>/dev/null`;
+
+# exit if we don't find jsvc
+if [ -z "$JSVC" ]; then
+echo no jsvc found in path;
+exit 1;
+fi
+
+unset OPTIONS
+[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
+
+# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not 
defined in $DEFAULT)
+JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk 
/usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 
/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 
/usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
+
+for jdir in $JDK_DIRS; do
+if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
+JAVA_HOME="$jdir"
+fi
+done
+export JAVA_HOME
+
+ACP=`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'`
+PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | 
sed s'/.$//'`
+
+# We need to append the JSVC daemon JAR to the classpath
+# AgentShell implements the JSVC daemon methods
+export 
CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
+
+start() {
+echo -n $"Starting $PROGNAME: "
+if hostname --fqdn >/dev/null 2>&1 ; then
+$JSVC -Xms256m -Xmx2048m -cp "$CLASSPATH" -pidfile "$PIDFILE" \
+-errfile $LOGDIR/cloudstack-agent.err -outfile 
$LOGDIR/cloudstack-agent.out $CLASS
+RETVAL=$?
+echo
+else
+failure
+echo
+echo The host name does not resolve properly to an IP address.  Cannot 
start "$PROGNAME". > /dev/stderr
+RETVAL=9
+fi
+[ $RETVAL = 0 ] && touch ${LOCKFILE}
+return $RETVAL
+}
+
+stop() {
+echo -n $"Stopping $PROGNAME: "
+$JSVC -pidfile "$PIDFILE" -stop $CLASS
+RETVAL=$?
+echo
+[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+}
+
+case "$1" in
+start)
+start
+

[15/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user

Signed-off-by: Rohit Yadav 
(cherry picked from commit cb08707addbffa12abc50aec9ad980059f23910c)
Signed-off-by: Rohit Yadav 

Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6df2fe7a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6df2fe7a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6df2fe7a

Branch: refs/heads/reporter
Commit: 6df2fe7a8ad70a10b4584391d1c56fc03ff0f85b
Parents: f393199
Author: Rohit Yadav 
Authored: Thu Feb 26 17:42:21 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 17:47:01 2015 +0530

--
 .../baremetal/manager/BaremetalVlanManager.java |  4 -
 .../manager/BaremetalVlanManagerImpl.java   | 11 +--
 .../src/com/cloud/user/AccountManagerImpl.java  | 93 ++--
 .../utils/baremetal/BaremetalUtils.java | 24 +
 4 files changed, 77 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df2fe7a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
index 76f1052..b6311f7 100644
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
@@ -27,11 +27,7 @@ import com.cloud.vm.VirtualMachineProfile;
 import org.apache.cloudstack.api.AddBaremetalRctCmd;
 import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
 
-/**
- * Created by frank on 4/30/14.
- */
 public interface BaremetalVlanManager extends Manager, PluggableService {
-public static final String BAREMETAL_SYSTEM_ACCOUNT_NAME = 
"baremetal-system-account";
 
 BaremetalRctResponse addRct(AddBaremetalRctCmd cmd);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df2fe7a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
index a77cf35..3169597 100644
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
@@ -43,6 +43,7 @@ import org.apache.cloudstack.api.AddBaremetalRctCmd;
 import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
 import org.apache.cloudstack.api.ListBaremetalRctCmd;
 import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.utils.baremetal.BaremetalUtils;
 import org.springframework.web.client.RestTemplate;
 
 import javax.inject.Inject;
@@ -235,14 +236,14 @@ public class BaremetalVlanManagerImpl extends ManagerBase 
implements BaremetalVl
 @Override
 public boolean start() {
 QueryBuilder acntq = QueryBuilder.create(AccountVO.class);
-acntq.and(acntq.entity().getAccountName(), SearchCriteria.Op.EQ, 
BaremetalVlanManager.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+acntq.and(acntq.entity().getAccountName(), SearchCriteria.Op.EQ, 
BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 AccountVO acnt = acntq.find();
 if (acnt != null) {
 return true;
 }
 
 acnt = new AccountVO();
-acnt.setAccountName(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+acnt.setAccountName(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 acnt.setUuid(UUID.randomUUID().toString());
 acnt.setState(Account.State.enabled);
 acnt.setDomainId(1);
@@ -252,9 +253,9 @@ public class BaremetalVlanManagerImpl extends ManagerBase 
implements BaremetalVl
 user.setState(Account.State.enabled);
 user.setUuid(UUID.randomUUID().toString());
 user.setAccountId(acnt.getAccountId());
-user.setUsername(BAREMETAL_SYSTEM_ACCOUNT_NAME);
-user.setFirstname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
-user.setLastname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setUsername(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setFirstname(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setLastname(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 user.setPassword(UUID.randomUUID().toString());
 user = userDao.persist(user);
 

http://git-wip-u

[13/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3931993/test/integration/component/test_multiple_ips_per_nic.py
--
diff --git a/test/integration/component/test_multiple_ips_per_nic.py 
b/test/integration/component/test_multiple_ips_per_nic.py
index 58aac9f..536c39d 100644
--- a/test/integration/component/test_multiple_ips_per_nic.py
+++ b/test/integration/component/test_multiple_ips_per_nic.py
@@ -23,15 +23,34 @@
 Design Document: 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 """
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-
+from marvin.lib.utils import (cleanup_resources,
+  random_gen,
+  validateList)
+from marvin.lib.base import (Account,
+ VirtualMachine,
+ PublicIPAddress,
+ NATRule,
+ StaticNATRule,
+ FireWallRule,
+ NIC,
+ Network,
+ VPC,
+ ServiceOffering,
+ VpcOffering,
+ Domain,
+ Router)
+from marvin.lib.common import (get_domain,
+   get_template,
+   get_zone,
+   setSharedNetworkParams,
+   get_free_vlan,
+   createEnabledNetworkOffering)
 from nose.plugins.attrib import attr
-from marvin.codes import PASS, ISOLATED_NETWORK, VPC_NETWORK, SHARED_NETWORK, 
FAIL
+from marvin.codes import PASS, ISOLATED_NETWORK, VPC_NETWORK, SHARED_NETWORK, 
FAIL, FAILED
 from ddt import ddt, data
 import time
 
+
 def createNetwork(self, networkType):
 """Create a network of given type (isolated/shared/isolated in VPC)"""
 
@@ -39,27 +58,36 @@ def createNetwork(self, networkType):
 
 if networkType == ISOLATED_NETWORK:
 try:
-network = 
Network.create(self.apiclient,self.services["isolated_network"],
- 
networkofferingid=self.isolated_network_offering.id,
- 
accountid=self.account.name,domainid=self.account.domainid,
- zoneid=self.zone.id)
+network = Network.create(
+self.apiclient,
+self.services["isolated_network"],
+networkofferingid=self.isolated_network_offering.id,
+accountid=self.account.name,
+domainid=self.account.domainid,
+zoneid=self.zone.id)
 except Exception as e:
 self.fail("Isolated network creation failed because: %s" % e)
 
 elif networkType == SHARED_NETWORK:
 physical_network, vlan = get_free_vlan(self.api_client, self.zone.id)
 
-#create network using the shared network offering created
+# create network using the shared network offering created
 self.services["shared_network"]["acltype"] = "domain"
 self.services["shared_network"]["vlan"] = vlan
-self.services["shared_network"]["networkofferingid"] = 
self.shared_network_offering.id
-self.services["shared_network"]["physicalnetworkid"] = 
physical_network.id
+self.services["shared_network"][
+"networkofferingid"] = self.shared_network_offering.id
+self.services["shared_network"][
+"physicalnetworkid"] = physical_network.id
 
-self.services["shared_network"] = 
setSharedNetworkParams(self.services["shared_network"])
+self.services["shared_network"] = setSharedNetworkParams(
+self.services["shared_network"])
 
 try:
-network = Network.create(self.api_client, 
self.services["shared_network"],
- 
networkofferingid=self.shared_network_offering.id, zoneid=self.zone.id)
+network = Network.create(
+self.api_client,
+self.services["shared_network"],
+networkofferingid=self.shared_network_offering.id,
+zoneid=self.zone.id)
 self.cleanup.append(network)
 except Exception as e:
 self.fail("Shared Network creation failed because: %s" % e)
@@ -67,53 +95,96 @@ def createNetwork(self, networkType):
 elif networkType == VPC_NETWORK:
 self.services["vpc"]["cidr"] = "10.1.1.1/16"
 self.debug("creating a VPC network in the account: %s" %
-self.account.name)
-vpc = VPC.create(self.apiclient, self.services["vpc"],
- vpcofferingid=self.vpc_off.id, zoneid=self.zone.id,

[50/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Proposal of a Usage Reporter / call-home functionality for CloudStack

With this commit the Management Server will be default generate a anonymous 
Usage
report every 7 (seven) days and submit this information back to the Apache 
CloudStack project.

These anonymous reports do NOT contain any information about Instance names, 
subnets, etc. It only
contains numbers about how CloudStack is being used.

This information is vital for the project to gain more insight in how 
CloudStack is being used.

Users can turn the reporting off by setting usage.report.interval to 0 (zero)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/178a938c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/178a938c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/178a938c

Branch: refs/heads/reporter
Commit: 178a938ca18f69ab50c64bd60ca27a8751a78230
Parents: 0b6c540
Author: Wido den Hollander 
Authored: Thu Nov 20 14:43:33 2014 +0100
Committer: Wido den Hollander 
Committed: Wed Mar 4 11:01:54 2015 +0100

--
 .../src/com/cloud/upgrade/dao/VersionDao.java   |   4 +
 .../com/cloud/upgrade/dao/VersionDaoImpl.java   |   9 +
 pom.xml |   2 +-
 reporter/README.md  |  18 +
 reporter/usage-report-collector.py  |  64 +++
 server/pom.xml  |  10 +
 .../spring-server-core-managers-context.xml |   2 +
 server/src/com/cloud/configuration/Config.java  |   5 +-
 .../cloudstack/report/AtomicGsonAdapter.java|  48 ++
 .../apache/cloudstack/report/UsageReporter.java | 470 +++
 setup/db/db/schema-450to460.sql |   2 +
 11 files changed, 632 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/178a938c/engine/schema/src/com/cloud/upgrade/dao/VersionDao.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDao.java 
b/engine/schema/src/com/cloud/upgrade/dao/VersionDao.java
index e280e0b..1a60f36 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/VersionDao.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/VersionDao.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.upgrade.dao;
 
+import java.util.List;
+
 import com.cloud.upgrade.dao.VersionVO.Step;
 import com.cloud.utils.db.GenericDao;
 
@@ -23,4 +25,6 @@ public interface VersionDao extends GenericDao {
 VersionVO findByVersion(String version, Step step);
 
 String getCurrentVersion();
+
+List getAllVersions();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/178a938c/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java 
b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
index 3be101b..344d8c0 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java
@@ -170,4 +170,13 @@ public class VersionDaoImpl extends 
GenericDaoBase implements V
 }
 
 }
+
+@Override
+@DB
+public List getAllVersions() {
+SearchCriteria sc = AllFieldsSearch.create();
+sc.setParameters("step", "Complete");
+
+return listBy(sc);
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/178a938c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 66fe7f7..e0c46e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 1.9.2
 1.0.0-build217
 2.6.9
-1.7.2
+2.3.1
 18.0
 6.2.0-3.1
 4.3.6

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/178a938c/reporter/README.md
--
diff --git a/reporter/README.md b/reporter/README.md
new file mode 100644
index 000..6453fa4
--- /dev/null
+++ b/reporter/README.md
@@ -0,0 +1,18 @@
+# CloudStack Usage Report
+
+This directory contains the CloudStack reporter webservice used by the Apache 
CloudStack project
+to gather anonymous statistical information about CloudStack deployments.
+
+Since version  the management server sends out a anonymized Usage 
Report out to the
+project every 7 days.
+
+This information is used to gain information about how CloudStack is being 
used.
+
+Turning this Usage Reporting functionality off can be done in the Global 
Settings by setting
+'usage.report.interval' to 0.
+
+# The webservice
+The Python Flask application in this directory is the webservice running on 
https://reports.cloudstack.apache.org/ (FIX ME?)
+and stores all the incoming information in a ElasticSearch data

[28/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8279: test fix for java 1.8

The test build on an assumption on the order of items in a Set, while this 
changed in java 1.8

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8c003d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8c003d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8c003d1

Branch: refs/heads/reporter
Commit: f8c003d13a4b26839712d8534f8b89fa00dc1275
Parents: e6e3a20
Author: Laszlo Hornyak 
Authored: Fri Feb 27 19:03:08 2015 +0100
Committer: Laszlo Hornyak 
Committed: Fri Feb 27 19:38:12 2015 +0100

--
 .../VirtualRoutingResourceTest.java | 204 +++
 1 file changed, 115 insertions(+), 89 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8c003d1/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
--
diff --git 
a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
 
b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index b77e92d..6d7ff29 100644
--- 
a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++ 
b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -24,6 +24,8 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -80,6 +82,9 @@ import com.cloud.network.vpc.NetworkACLItem.TrafficType;
 import com.cloud.network.vpc.VpcGateway;
 import com.cloud.utils.ExecutionResult;
 import com.cloud.utils.net.NetUtils;
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class)
@@ -1003,95 +1008,116 @@ public class VirtualRoutingResourceTest implements 
VirtualRouterDeployer {
 assertEquals(path, "/var/cache/cloud/");
 assertTrue(filename.startsWith("VR-"));
 assertTrue(filename.endsWith(".cfg"));
-assertEquals(content, "#Apache CloudStack Virtual Router Config 
File\n" +
-"\n" +
-"1.0\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/ipassoc.sh -A -s -f -l 64.1.1.10/24 -c eth2 -g 
64.1.1.1\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/ipassoc.sh -D -l 64.1.1.11/24 -c eth2 -g 
64.1.1.1\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/ipassoc.sh -A -l 65.1.1.11/24 -c eth2 -g 
65.1.1.1\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/vpc_ipassoc.sh  -A  -l 64.1.1.10 -c eth2 -g 
64.1.1.1 -m 24 -n 64.1.1.0\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/vpc_privateGateway.sh  -A  -l 64.1.1.10 -c 
eth2\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/vpc_ipassoc.sh  -D  -l 64.1.1.11 -c eth2 -g 
64.1.1.1 -m 24 -n 64.1.1.0\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/vpc_privateGateway.sh  -D  -l 64.1.1.11 -c 
eth2\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/vpc_ipassoc.sh  -A  -l 65.1.1.11 -c eth2 -g 
65.1.1.1 -m 24 -n 65.1.1.0\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/firewall_ingress.sh  -F -a 
64.10.10.10:ICMP:0:0:10.10.1.1/24-10.10.1.2/24:,64.10.10.10:TCP:22:80:10.10.1.1/24-10.10.1.2/24:,64.10.10.10:reverted:0:0:0:,\n"
 +
-"\n" +
-"\n" +
-"/opt/cloud/bin/firewall_nat.sh -A -P tcp -l 64.1.1.10 -p 
22:80 -r 10.10.1.10 -d 22:80\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/firewall_nat.sh -D -P udp -l 64.1.1.11 -p 
8080:8080 -r 10.10.1.11 -d 8080:8080\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/vpc_portforwarding.sh -A -P tcp -l 64.1.1.10 
-p 22:80 -r 10.10.1.10 -d 22-80\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/vpc_portforwarding.sh -D -P udp -l 64.1.1.11 
-p 8080:8080 -r 10.10.1.11 -d 8080-8080\n" +
-"\n" +
-"\n" +
-"/opt/cloud/bin/createIpAlias.sh 
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
 +
-"\n" +
-"\n" +
-"/opt/cloud/bin/deleteIpAlias.sh

[37/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

packaging: date fix

rpmbuild complained about the date "Fri Oct 03 2012"
according to the calendar, Oct 3 2012 was Wednesday

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a0eb1449
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0eb1449
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0eb1449

Branch: refs/heads/reporter
Commit: a0eb1449870497f088d539ab1d8a61cc341fd8f2
Parents: ed099c3
Author: Laszlo Hornyak 
Authored: Mon Mar 2 01:56:55 2015 +0100
Committer: Laszlo Hornyak 
Committed: Mon Mar 2 02:08:17 2015 +0100

--
 packaging/fedora20/cloud.spec | 2 +-
 packaging/fedora21/cloud.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0eb1449/packaging/fedora20/cloud.spec
--
diff --git a/packaging/fedora20/cloud.spec b/packaging/fedora20/cloud.spec
index d0269f7..84b29db 100644
--- a/packaging/fedora20/cloud.spec
+++ b/packaging/fedora20/cloud.spec
@@ -701,5 +701,5 @@ fi
 * Fri Jul 04 2014 Hugo Trippaers  4.5.0
 - Add a package for the mysql ha module
 
-* Fri Oct 03 2012 Hugo Trippaers  4.1.0
+* Wed Oct 03 2012 Hugo Trippaers  4.1.0
 - new style spec file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0eb1449/packaging/fedora21/cloud.spec
--
diff --git a/packaging/fedora21/cloud.spec b/packaging/fedora21/cloud.spec
index 73de980..98b12ba 100644
--- a/packaging/fedora21/cloud.spec
+++ b/packaging/fedora21/cloud.spec
@@ -701,5 +701,5 @@ fi
 * Fri Jul 04 2014 Hugo Trippaers  4.5.0
 - Add a package for the mysql ha module
 
-* Fri Oct 03 2012 Hugo Trippaers  4.1.0
+* Wed Oct 03 2012 Hugo Trippaers  4.1.0
 - new style spec file

[35/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8292: fix for java 1.8 compilation

Refactored to use the XPatch expressions to check the generated domain xml 
rathern than string comparison.

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0fda5a03
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fda5a03
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fda5a03

Branch: refs/heads/reporter
Commit: 0fda5a03a43916a7b3ae59208ba0bfc8b3e5b841
Parents: ed099c3
Author: Laszlo Hornyak 
Authored: Sat Feb 28 19:36:01 2015 +0100
Committer: Laszlo Hornyak 
Committed: Sat Feb 28 20:11:46 2015 +0100

--
 .../resource/LibvirtComputingResourceTest.java  | 254 ++-
 1 file changed, 83 insertions(+), 171 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fda5a03/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
--
diff --git 
a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
 
b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index bf4546c..b82796f 100644
--- 
a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ 
b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -19,17 +19,23 @@
 
 package com.cloud.hypervisor.kvm.resource;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 
-import junit.framework.Assert;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.lang.SystemUtils;
+import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 import org.libvirt.Connect;
@@ -43,6 +49,8 @@ import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
 
 import com.cloud.agent.api.VmStatsEntry;
 import com.cloud.agent.api.to.VirtualMachineTO;
@@ -75,8 +83,6 @@ public class LibvirtComputingResourceTest {
 int maxRam = 512 * 1024;
 
 String os = "Ubuntu";
-boolean haEnabled = false;
-boolean limitCpuUse = false;
 
 String vncAddr = "";
 String vncPassword = "mySuperSecretPassword";
@@ -89,47 +95,7 @@ public class LibvirtComputingResourceTest {
 LibvirtVMDef vm = lcr.createVMFromSpec(to);
 vm.setHvsType(_hyperVisorType);
 
-String vmStr = "\n";
-vmStr += "" + name + "\n";
-vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n";
-vmStr += "" + os + "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "" + maxRam / 1024 + "\n";
-vmStr += "" + minRam / 1024 + "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "" + cpus + "\n";
-vmStr += "\n";
-vmStr += "hvm\n";
-vmStr += "\n";
-vmStr += "\n";
-vmStr += "\n";
-//vmStr += "\n";
-//vmStr += "" + (cpus * speed) + "\n";
-//vmStr += "\n";
-vmStr += "";
-vmStr += "restart\n";
-vmStr += "destroy\n";
-vmStr += "destroy\n";
-vmStr += "\n";
-assertEquals(vmStr, vm.toString());
+verifyVm(to, vm);
 }
 
 /**
@@ -147,8 +113,6 @@ public class LibvirtComputingResourceTest {
 int maxRam = 512 * 1024;
 
 String os = "Ubuntu";
-boolean haEnabled = false;
-boolean limitCpuUse = false;
 
 String vncAddr = "";
 String vncPassword = "mySuperSecretPassword";
@@ -161,45 +125,7 @@ public class LibvirtComputingResourceTest {
 LibvirtVMDef vm = lcr.createVMFromSpec(to);
 vm.setHvsType(_hyperVisorType);
 
-String vmStr = "\n";
-vmStr += "" + name + "\n";
-vmStr += "b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9\n";
-vmStr += "" + os + "\n";

[25/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

server: fix unit test to fix build

Signed-off-by: Rohit Yadav 
(cherry picked from commit dd5fb2ebd6904026e2ba0b3efcb6c382f860ffdd)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3786aa0e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3786aa0e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3786aa0e

Branch: refs/heads/reporter
Commit: 3786aa0e67c3ae0981699b8194ed4e90ca7494e1
Parents: 43cf1da
Author: Rohit Yadav 
Authored: Fri Feb 27 19:18:18 2015 +0530
Committer: Rohit Yadav 
Committed: Fri Feb 27 19:19:09 2015 +0530

--
 server/test/com/cloud/user/AccountManagerImplTest.java | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3786aa0e/server/test/com/cloud/user/AccountManagerImplTest.java
--
diff --git a/server/test/com/cloud/user/AccountManagerImplTest.java 
b/server/test/com/cloud/user/AccountManagerImplTest.java
index 5fff331..f70aa39 100644
--- a/server/test/com/cloud/user/AccountManagerImplTest.java
+++ b/server/test/com/cloud/user/AccountManagerImplTest.java
@@ -18,6 +18,7 @@ package com.cloud.user;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.ArrayList;
 
 import javax.inject.Inject;
 
@@ -40,6 +41,10 @@ import 
org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.messagebus.MessageBus;
 import org.apache.cloudstack.region.gslb.GlobalLoadBalancerRuleDao;
 
+import com.cloud.vm.snapshot.VMSnapshotManager;
+import com.cloud.vm.snapshot.VMSnapshotVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDao;
+
 import com.cloud.configuration.ConfigurationManager;
 import com.cloud.configuration.dao.ResourceCountDao;
 import com.cloud.configuration.dao.ResourceLimitDao;
@@ -178,6 +183,11 @@ public class AccountManagerImplTest {
 MessageBus _messageBus;
 
 @Mock
+VMSnapshotManager _vmSnapshotMgr;
+@Mock
+VMSnapshotDao _vmSnapshotDao;
+
+@Mock
 User callingUser;
 @Mock
 Account callingAccount;
@@ -264,6 +274,7 @@ public class AccountManagerImplTest {
 securityChecker.checkAccess(Mockito.any(Account.class),
 Mockito.any(Domain.class)))
 .thenReturn(true);
+
Mockito.when(_vmSnapshotDao.listByAccountId(Mockito.anyLong())).thenReturn(new 
ArrayList());
 
 Assert.assertTrue(accountManager.deleteUserAccount(42));
 // assert that this was a clean delete

[04/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

LibvirtComputingResource: Fix coverity scan, recent bugfixes revealed a 
potential unhandled null in getResizeScriptType

Change-Id: I5715a4424646261f2c43cd5e0a16fd72dd12c753


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/77d11eb1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77d11eb1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77d11eb1

Branch: refs/heads/reporter
Commit: 77d11eb1a3f58c3c78cddfac600252f3c6af6862
Parents: 09e26c8
Author: Marcus Sorensen 
Authored: Mon Feb 23 16:55:56 2015 -0800
Committer: Marcus Sorensen 
Committed: Mon Feb 23 16:56:19 2015 -0800

--
 .../hypervisor/kvm/resource/LibvirtComputingResource.java  | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77d11eb1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
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 48ad19d..341c4f8 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
@@ -1840,7 +1840,7 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 && volFormat == PhysicalDiskFormat.QCOW2 ) {
 return "QCOW2";
 }
-return null;
+throw new CloudRuntimeException("Cannot determine resize type from 
pool type " + pool.getType());
 }
 
 /* uses a local script now, eventually support for virStorageVolResize() 
will maybe work on
@@ -1867,9 +1867,7 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 String type = getResizeScriptType(pool, vol);
 
 if (pool.getType() != StoragePoolType.RBD) {
-if (type == null) {
-return new ResizeVolumeAnswer(cmd, false, "Unsupported 
volume format: pool type '" + pool.getType() + "' and volume format '" + 
vol.getFormat() + "'");
-} else if (type.equals("QCOW2") && shrinkOk) {
+if (type.equals("QCOW2") && shrinkOk) {
 return new ResizeVolumeAnswer(cmd, false, "Unable to 
shrink volumes of type " + type);
 }
 } else {

[19/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Fix cloud.spec for building management rpm, need not create agent dir but agetn 
rpm (kvm host agent)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eaf73491
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eaf73491
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eaf73491

Branch: refs/heads/reporter
Commit: eaf734915fc2b61affcf8b9fb2b4b9fc7eeda2bf
Parents: b6d9163
Author: ghxandsky 
Authored: Thu Feb 26 23:51:43 2015 +0800
Committer: ghxandsky 
Committed: Thu Feb 26 23:51:43 2015 +0800

--
 packaging/centos63/cloud.spec | 1 -
 packaging/centos7/cloud.spec  | 1 -
 packaging/fedora20/cloud.spec | 1 -
 packaging/fedora21/cloud.spec | 1 -
 4 files changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaf73491/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index dff5dcb..5601dff 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -580,7 +580,6 @@ fi
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
-%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaf73491/packaging/centos7/cloud.spec
--
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 88c3190..3aec349 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -490,7 +490,6 @@ fi
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
-%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management
 %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaf73491/packaging/fedora20/cloud.spec
--
diff --git a/packaging/fedora20/cloud.spec b/packaging/fedora20/cloud.spec
index ea1739e..d0269f7 100644
--- a/packaging/fedora20/cloud.spec
+++ b/packaging/fedora20/cloud.spec
@@ -582,7 +582,6 @@ fi
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
-%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaf73491/packaging/fedora21/cloud.spec
--
diff --git a/packaging/fedora21/cloud.spec b/packaging/fedora21/cloud.spec
index 2338b3c..73de980 100644
--- a/packaging/fedora21/cloud.spec
+++ b/packaging/fedora21/cloud.spec
@@ -582,7 +582,6 @@ fi
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work
 %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
-%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management
 %config(noreplace) %attr(0640,root,cloud) 
%{_sysconfdir}/%{name}/management/db.properties

[18/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Add distribution fedora21 in packaging/package.sh


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6d9163a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6d9163a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6d9163a

Branch: refs/heads/reporter
Commit: b6d9163ae2c1eb255bb4012b1a676193a0a227b5
Parents: d8e1bf1
Author: ghxandsky 
Authored: Thu Feb 26 22:54:04 2015 +0800
Committer: ghxandsky 
Committed: Thu Feb 26 22:54:04 2015 +0800

--
 packaging/package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6d9163a/packaging/package.sh
--
diff --git a/packaging/package.sh b/packaging/package.sh
index 3abbaf2..5e7304a 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -23,7 +23,7 @@ function usage() {
 echo "The commonly used Arguments are:"
 echo "-p|--pack oss|OSS To package with only redistributable 
libraries (default)"
 echo "-p|--pack noredist|NOREDIST   To package with non-redistributable 
libraries"
-echo "-d centos7|centos63|fedora20  To build a package for a distribution"
+echo "-d centos7|centos63|fedora20|fedora21  To build a package for a 
distribution"
 echo "-s simulator|SIMULATORTo build for Simulator"
 echo ""
 echo "Examples: ./package.sh -p|--pack oss|OSS"

[17/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-7089: don't log VNC password

Signed-off-by: Rohit Yadav 
(cherry picked from commit e287de9fd90a06ee7f86d31ba69a84481f0820f1)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d8e1bf15
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d8e1bf15
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d8e1bf15

Branch: refs/heads/reporter
Commit: d8e1bf15062bb2d4bbd4dd3ae1d32697ce1053b5
Parents: 4dde410
Author: Rohit Yadav 
Authored: Thu Feb 26 18:10:23 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 18:11:12 2015 +0530

--
 server/src/com/cloud/consoleproxy/AgentHookBase.java  | 2 +-
 server/src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8e1bf15/server/src/com/cloud/consoleproxy/AgentHookBase.java
--
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java 
b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 8a5bae5..b61ba13 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -146,7 +146,7 @@ public abstract class AgentHookBase implements AgentHook {
 
 String sid = cmd.getSid();
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 return new ConsoleAccessAuthenticationAnswer(cmd, false);
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8e1bf15/server/src/com/cloud/servlet/ConsoleProxyServlet.java
--
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java 
b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index d08bcdb..3389d92 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -317,7 +317,7 @@ public class ConsoleProxyServlet extends HttpServlet {
 
 String sid = req.getParameter("sid");
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 sendResponse(resp, "failed");
 return;
 }

[24/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-5238: password checks, NPE fixes and minor fixes

- insecure authenticators excluded in configuration
- snapshot response should have zone
- remove vmsnapshots when removing accounts

Signed-off-by: Rohit Yadav 
(cherry picked from commit 5481485a083957ff58da3b6fea9d7b6d20f06875)
Signed-off-by: Rohit Yadav 

Conflicts:
api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/storage/download/DownloadActiveState.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/43cf1da8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/43cf1da8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/43cf1da8

Branch: refs/heads/reporter
Commit: 43cf1da865c1e4ed6523fb5b2ba315a547fac79f
Parents: 8829a0d
Author: Rohit Yadav 
Authored: Fri Feb 27 18:20:10 2015 +0530
Committer: Rohit Yadav 
Committed: Fri Feb 27 18:24:46 2015 +0530

--
 .../api/response/VMSnapshotResponse.java|  2 +-
 .../cloud/vm/snapshot/dao/VMSnapshotDao.java|  2 ++
 .../vm/snapshot/dao/VMSnapshotDaoImpl.java  |  6 +
 server/src/com/cloud/api/ApiResponseHelper.java |  4 +++
 .../cloud/ha/dao/HighAvailabilityDaoImpl.java   |  2 ++
 .../cloud/hypervisor/HypervisorGuruBase.java|  6 +++--
 server/src/com/cloud/hypervisor/KVMGuru.java| 27 +++-
 .../com/cloud/resource/ResourceManagerImpl.java |  6 ++---
 .../resourcelimit/ResourceLimitManagerImpl.java |  3 ++-
 .../cloud/server/ConfigurationServerImpl.java   |  3 +++
 .../src/com/cloud/user/AccountManagerImpl.java  | 23 -
 11 files changed, 69 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43cf1da8/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java 
b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
index 29d06b9..1285f73 100644
--- a/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
@@ -192,7 +192,7 @@ public class VMSnapshotResponse extends BaseResponse 
implements ControlledEntity
   this.parent = parent;
 }
 
-  public String getType() {
+public String getType() {
 return type;
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43cf1da8/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
--
diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java 
b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
index e714a6e..31999ef 100644
--- a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
+++ b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDao.java
@@ -36,4 +36,6 @@ public interface VMSnapshotDao extends 
GenericDao, StateDao<
 List listByParent(Long vmSnapshotId);
 
 VMSnapshotVO findByName(Long vmId, String name);
+
+List listByAccountId(Long accountId);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43cf1da8/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java 
b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
index dccd19f..a87d284 100644
--- a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java
@@ -121,6 +121,12 @@ public class VMSnapshotDaoImpl extends 
GenericDaoBase implem
 return null;
 }
 
+public List listByAccountId(Long accountId) {
+SearchCriteria sc = this.AllFieldsSearch.create();
+sc.setParameters("accountId", new Object[] { accountId });
+return listBy(sc, null);
+}
+
 @Override
 public boolean updateState(State currentState, Event event, State 
nextState, VMSnapshot vo, Object data) {
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43cf1da8/server/src/com/cloud/api/ApiResponseHelper.java
--
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java 
b/server/src/com/cloud/api/ApiResponseHelper.java
index f7059ef..b17b5cc 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -472,6 +472,10 @@ public class ApiResponseHelper implements 
ResponseGenerator {
 snapshotResponse.setVolumeId(volume.getUuid());
 snapshotRe

[22/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8273: fix baremetal account creation

Signed-off-by: Rohit Yadav 
(cherry picked from commit e000646790597cb6c245311f57761b41d23a4e34)
Signed-off-by: Rohit Yadav 

Conflicts:

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a75ff231
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a75ff231
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a75ff231

Branch: refs/heads/reporter
Commit: a75ff231315e045d441c25e6b368ad2e863cc004
Parents: 6f4db0c
Author: Rohit Yadav 
Authored: Fri Feb 27 15:52:25 2015 +0530
Committer: Rohit Yadav 
Committed: Fri Feb 27 15:55:09 2015 +0530

--
 api/src/com/cloud/user/AccountService.java  |  2 ++
 .../manager/BaremetalVlanManagerImpl.java   |  7 ++
 .../contrail/management/MockAccountManager.java |  6 +
 .../src/com/cloud/user/AccountManagerImpl.java  | 23 
 .../com/cloud/user/MockAccountManagerImpl.java  |  5 +
 5 files changed, 38 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a75ff231/api/src/com/cloud/user/AccountService.java
--
diff --git a/api/src/com/cloud/user/AccountService.java 
b/api/src/com/cloud/user/AccountService.java
index 75f95ce..c483d05 100644
--- a/api/src/com/cloud/user/AccountService.java
+++ b/api/src/com/cloud/user/AccountService.java
@@ -105,6 +105,8 @@ public interface AccountService {
 
 public String[] createApiKeyAndSecretKey(RegisterCmd cmd);
 
+public String[] createApiKeyAndSecretKey(final long userId);
+
 UserAccount getUserByApiKey(String apiKey);
 
 RoleType getRoleType(Account account);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a75ff231/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
index 3169597..d3ea3d2 100644
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
@@ -42,8 +42,7 @@ import com.google.gson.Gson;
 import org.apache.cloudstack.api.AddBaremetalRctCmd;
 import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
 import org.apache.cloudstack.api.ListBaremetalRctCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
-import org.apache.cloudstack.utils.baremetal.BaremetalUtils;
+import org.apache.cloudstack.utils.baremetal.BaremetalUtils;
 import org.springframework.web.client.RestTemplate;
 
 import javax.inject.Inject;
@@ -259,9 +258,7 @@ public class BaremetalVlanManagerImpl extends ManagerBase 
implements BaremetalVl
 user.setPassword(UUID.randomUUID().toString());
 user = userDao.persist(user);
 
-RegisterCmd cmd = new RegisterCmd();
-cmd.setId(user.getId());
-String[] keys = acntMgr.createApiKeyAndSecretKey(cmd);
+String[] keys = acntMgr.createApiKeyAndSecretKey(user.getId());
 user.setApiKey(keys[0]);
 user.setSecretKey(keys[1]);
 userDao.update(user.getId(), user);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a75ff231/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
--
diff --git 
a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
 
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index daeb6bd..9bc11d6 100644
--- 
a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ 
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -116,6 +116,12 @@ public class MockAccountManager extends ManagerBase 
implements AccountManager {
 }
 
 @Override
+public String[] createApiKeyAndSecretKey(final long userId) {
+// TODO Auto-generated method stub
+return null;
+}
+
+@Override
 public User createUser(String arg0, String arg1, String arg2, String arg3, 
String arg4, String arg5, String arg6, Long arg7, String arg8) {
 // TODO Auto-generated method stub
 return null;

http://git-wip-us.apache.org/r

[10/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8285: check and update IP capacity states based on allocation state

- Backend should update if state was diabled and now has changed
- UI's fetch latest does not actually fetch latest

Signed-off-by: Rohit Yadav 
(cherry picked from commit 985a61652eb5dc97503c002e9fc3c3a7ca39b70c)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1827fc6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1827fc6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1827fc6

Branch: refs/heads/reporter
Commit: e1827fc696b1c4554881e340ae4cbc455495f13f
Parents: cc9461b
Author: Rohit Yadav 
Authored: Wed Feb 25 15:52:57 2015 +0530
Committer: Rohit Yadav 
Committed: Wed Feb 25 16:47:40 2015 +0530

--
 .../src/com/cloud/alert/AlertManagerImpl.java   | 17 
 .../com/cloud/server/ManagementServerImpl.java  |  5 +++
 .../com/cloud/storage/StorageManagerImpl.java   | 41 
 ui/scripts/dashboard.js | 14 ++-
 4 files changed, 33 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1827fc6/server/src/com/cloud/alert/AlertManagerImpl.java
--
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java 
b/server/src/com/cloud/alert/AlertManagerImpl.java
index 3f599a1..8653069 100644
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -364,16 +364,16 @@ public class AlertManagerImpl extends ManagerBase 
implements AlertManager, Confi
 int totalVlans = _dcDao.countZoneVlans(dcId, false);
 int allocatedVlans = _dcDao.countZoneVlans(dcId, true);
 
+CapacityState vlanCapacityState = (capacityState == 
AllocationState.Disabled) ? CapacityState.Disabled : CapacityState.Enabled;
 if (capacities.size() == 0) {
 CapacityVO newVlanCapacity = new CapacityVO(null, dcId, null, 
null, allocatedVlans, totalVlans, Capacity.CAPACITY_TYPE_VLAN);
-if (capacityState == AllocationState.Disabled) {
-newVlanCapacity.setCapacityState(CapacityState.Disabled);
-}
+newVlanCapacity.setCapacityState(vlanCapacityState);
 _capacityDao.persist(newVlanCapacity);
-} else if (!(capacities.get(0).getUsedCapacity() == allocatedVlans && 
capacities.get(0).getTotalCapacity() == totalVlans)) {
+} else if (!(capacities.get(0).getUsedCapacity() == allocatedVlans && 
capacities.get(0).getTotalCapacity() == totalVlans && 
capacities.get(0).getCapacityState() == vlanCapacityState)) {
 CapacityVO capacity = capacities.get(0);
 capacity.setUsedCapacity(allocatedVlans);
 capacity.setTotalCapacity(totalVlans);
+capacity.setCapacityState(vlanCapacityState);
 _capacityDao.update(capacity.getId(), capacity);
 }
 
@@ -402,19 +402,18 @@ public class AlertManagerImpl extends ManagerBase 
implements AlertManager, Confi
 allocatedIPs = _publicIPAddressDao.countIPsForNetwork(dcId, true, 
VlanType.DirectAttached);
 }
 
+CapacityState ipCapacityState = (capacityState == 
AllocationState.Disabled) ? CapacityState.Disabled : CapacityState.Enabled;
 if (capacities.size() == 0) {
 CapacityVO newPublicIPCapacity = new CapacityVO(null, dcId, podId, 
null, allocatedIPs, totalIPs, capacityType);
-if (capacityState == AllocationState.Disabled) {
-newPublicIPCapacity.setCapacityState(CapacityState.Disabled);
-}
+newPublicIPCapacity.setCapacityState(ipCapacityState);
 _capacityDao.persist(newPublicIPCapacity);
-} else if (!(capacities.get(0).getUsedCapacity() == allocatedIPs && 
capacities.get(0).getTotalCapacity() == totalIPs)) {
+} else if (!(capacities.get(0).getUsedCapacity() == allocatedIPs && 
capacities.get(0).getTotalCapacity() == totalIPs && 
capacities.get(0).getCapacityState() == ipCapacityState)) {
 CapacityVO capacity = capacities.get(0);
 capacity.setUsedCapacity(allocatedIPs);
 capacity.setTotalCapacity(totalIPs);
+capacity.setCapacityState(ipCapacityState);
 _capacityDao.update(capacity.getId(), capacity);
 }
-
 }
 
 class CapacityChecker extends ManagedContextTimerTask {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1827fc6/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index aa158b4..eabaf23 100644
--- a

[42/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge remote-tracking branch 'anshul/CLOUDSTACK-6900'

This closes #68

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef99f01e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef99f01e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef99f01e

Branch: refs/heads/reporter
Commit: ef99f01e59aafc98feb034fff08c7ead28e69e2b
Parents: 085554d 91e1881
Author: Rohit Yadav 
Authored: Mon Mar 2 16:40:33 2015 +0530
Committer: Rohit Yadav 
Committed: Mon Mar 2 16:40:44 2015 +0530

--
 .../image/db/VolumeDataStoreDaoImpl.java| 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)
--

[41/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge remote-tracking branch 'laszlo/CLOUDSTACK-8292'

This closes #91

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/085554d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/085554d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/085554d8

Branch: refs/heads/reporter
Commit: 085554d81d6f05209d52cc6708103514d4bc496d
Parents: db443c1 0fda5a0
Author: Rohit Yadav 
Authored: Mon Mar 2 16:37:11 2015 +0530
Committer: Rohit Yadav 
Committed: Mon Mar 2 16:37:20 2015 +0530

--
 .../resource/LibvirtComputingResourceTest.java  | 254 ++-
 1 file changed, 83 insertions(+), 171 deletions(-)
--

[34/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

server: check and set sercure cookie flag only after login

Signed-off-by: Rohit Yadav 
(cherry picked from commit 0f819f1583116d93ca3ebf460b69cd74144a25b2)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed099c3f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed099c3f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed099c3f

Branch: refs/heads/reporter
Commit: ed099c3f964e4b18a3c431b59cdb63533ec91d81
Parents: 20bcb4b
Author: Rohit Yadav 
Authored: Sat Feb 28 18:20:56 2015 +0530
Committer: Rohit Yadav 
Committed: Sat Feb 28 18:23:05 2015 +0530

--
 server/src/com/cloud/api/ApiServlet.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed099c3f/server/src/com/cloud/api/ApiServlet.java
--
diff --git a/server/src/com/cloud/api/ApiServlet.java 
b/server/src/com/cloud/api/ApiServlet.java
index 5628d98..1fd16ba 100644
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -194,6 +194,14 @@ public class ApiServlet extends HttpServlet {
 }
 }
 session = req.getSession(true);
+if (ApiServer.isSecureSessionCookieEnabled()) {
+resp.setHeader("SET-COOKIE", "JSESSIONID=" + 
session.getId() + ";Secure;Path=/client");
+if (s_logger.isDebugEnabled()) {
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("Session cookie is marked 
secure!");
+}
+}
+}
 }
 
 try {

[29/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8279: Fix unit test for java 1.8

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df11bb28
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df11bb28
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df11bb28

Branch: refs/heads/reporter
Commit: df11bb28110d49b5a46790c351a3f309b5c6569e
Parents: f8c003d
Author: Laszlo Hornyak 
Authored: Fri Feb 27 20:06:27 2015 +0100
Committer: Laszlo Hornyak 
Committed: Fri Feb 27 20:06:27 2015 +0100

--
 .../resource/virtualnetwork/VirtualRoutingResourceTest.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df11bb28/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
--
diff --git 
a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
 
b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index 6d7ff29..c6189c5 100644
--- 
a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++ 
b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -674,7 +674,13 @@ public class VirtualRoutingResourceTest implements 
VirtualRouterDeployer {
 
 private void verifyArgs(SetFirewallRulesCommand cmd, String script, String 
args) {
 assertEquals(script, VRScripts.FIREWALL_INGRESS);
-assertEquals(args, " -F -a 
64.10.10.10:ICMP:0:0:10.10.1.1/24-10.10.1.2/24:,64.10.10.10:TCP:22:80:10.10.1.1/24-10.10.1.2/24:,64.10.10.10:reverted:0:0:0:,");
+
+//Since the arguments are generated with a Set
+//one can not make a bet on the order
+assertTrue(args.startsWith(" -F -a "));
+
assertTrue(args.contains("64.10.10.10:ICMP:0:0:10.10.1.1/24-10.10.1.2/24:"));
+assertTrue(args.contains("64.10.10.10:reverted:0:0:0:"));
+
assertTrue(args.contains("64.10.10.10:TCP:22:80:10.10.1.1/24-10.10.1.2/24:"));
 }
 
 @Test

[47/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8298: Update copying large size VR config file in xenserver

 When there is large size VR configuration (aggregate commands) copying data to 
VR using vmops plugin was failed
 because of the ARG_MAX size limitation. The configuration data size is around 
300KB.

 Updated this to create file in host by scp with file contents. This will 
create file in host.
 Then copy the file from the host to VR using hte vmops createFileInDomr method.

  In host file get created in /tmp/ with name VR-.cfg, once it copied to 
VR this file will be removed.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/619f0142
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/619f0142
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/619f0142

Branch: refs/heads/reporter
Commit: 619f0142555d2245e3fa90036f825525191b31bd
Parents: 1f72548
Author: Jayapal 
Authored: Mon Feb 23 13:51:20 2015 +0530
Committer: Jayapal 
Committed: Wed Mar 4 11:52:10 2015 +0530

--
 .../xenserver/resource/CitrixResourceBase.java  | 14 ++---
 scripts/vm/hypervisor/xenserver/vmops   | 21 +---
 2 files changed, 20 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/619f0142/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 6d777e4..a4aa4b6 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -571,9 +571,17 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 @Override
 public ExecutionResult createFileInVR(String routerIp, String path, String 
filename, String content) {
 Connection conn = getConnection();
-String rc = callHostPlugin(conn, "vmops", "createFileInDomr", 
"domrip", routerIp, "filepath", path + filename, "filecontents", content);
-s_logger.debug ("VR Config file " + filename + " got created in VR 
with ip " + routerIp + " with content \n" + content);
-// Fail case would be start with "fail#"
+String hostPath = "/tmp/";
+
+s_logger.debug("Copying VR with ip " + routerIp +" config file into 
host "+ _host.ip );
+try {
+SshHelper.scpTo(_host.ip, 22, _username, null, _password.peek(), 
hostPath, content.getBytes(), filename, null);
+} catch (Exception e) {
+s_logger.warn("scp VR config file into host " + _host.ip + " 
failed with exception " + e.getMessage().toString());
+}
+
+String rc = callHostPlugin(conn, "vmops", "createFileInDomr", 
"domrip", routerIp, "srcfilepath", hostPath + filename, "dstfilepath", path);
+s_logger.debug ("VR Config file " + filename + " got created in VR, ip 
" + routerIp + " with content \n" + content);
 return new ExecutionResult(rc.startsWith("succ#"), rc.substring(5));
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/619f0142/scripts/vm/hypervisor/xenserver/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops 
b/scripts/vm/hypervisor/xenserver/vmops
index 62a60bb..a73084a 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -204,20 +204,17 @@ def createFile(session, args):
 
 @echo
 def createFileInDomr(session, args):
-file_path = args['filepath']
-file_contents = args['filecontents']
+src_filepath = args['srcfilepath']
+dst_path = args['dstfilepath']
 domrip = args['domrip']
+txt=""
 try:
-tmpfile = util.pread2(['mktemp']).strip()
-f = open(tmpfile, "w")
-f.write(file_contents)
-f.close()
-target = "root@" + domrip + ":" + file_path
-txt = 
util.pread2(['scp','-P','3922','-q','-o','StrictHostKeyChecking=no','-i','/root/.ssh/id_rsa.cloud',tmpfile,
 target])
-util.pread2(['rm',tmpfile])
+target = "root@" + domrip + ":" + dst_path
+txt = 
util.pread2(['scp','-P','3922','-q','-o','StrictHostKeyChecking=no','-i','/root/.ssh/id_rsa.cloud',src_filepath,
 target])
+util.pread2(['rm',src_filepath])
 txt = 'succ#' + txt
 except:
-logging.debug("failed to create file " + file_path + " in VR, contain: 
" + file_contents)
+logging.debug("failed to copy file " + src_filepath + " from host to 
VR with

[05/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8265: added os mappings for Ubuntu 14.04


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6caee859
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6caee859
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6caee859

Branch: refs/heads/reporter
Commit: 6caee8590a91695b98e4b932cb1d4ee6faff6d44
Parents: 77d11eb
Author: Abhinandan Prateek 
Authored: Tue Feb 24 07:27:23 2015 -0500
Committer: Abhinandan Prateek 
Committed: Tue Feb 24 07:30:54 2015 -0500

--
 setup/db/db/schema-442to450.sql | 21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6caee859/setup/db/db/schema-442to450.sql
--
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index 798b232..a1d9b0e 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -763,7 +763,7 @@ INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, 
category_id, display_name, crea
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (238, UUID(), 4, 'Red Hat Enterprise Linux 5 (64-bit)', 
utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (239, UUID(), 4, 'Red Hat Enterprise Linux 6 (32-bit)', 
utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (240, UUID(), 4, 'Red Hat Enterprise Linux 6 (64-bit)', 
utc_timestamp());
-INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (241, UUID(), 10, 'Ubuntu 14.04', utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (241, UUID(), 10, 'Ubuntu 14.04 (32-bit)', utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (244, UUID(), 5, 'SUSE Linux Enterprise Server 12 (64-bit)', 
utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (245, UUID(), 4, 'Red Hat Enterprise Linux 7', utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (246, UUID(), 1, 'CentOS 7', utc_timestamp());
@@ -772,6 +772,7 @@ INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, 
category_id, display_name, crea
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (249, UUID(), 1, 'CentOS 6 (64-bit)', utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (250, UUID(), 3, 'Oracle Enterprise Linux 6.5 (32-bit)', 
utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (251, UUID(), 3, 'Oracle Enterprise Linux 6.5 (64-bit)', 
utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (254, UUID(), 10, 'Ubuntu 14.04 (64-bit)', utc_timestamp());
 
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'CentOS 4.5 (32-bit)', 1, utc_timestamp(), 
0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'CentOS 4.6 (32-bit)', 2, utc_timestamp(), 
0);
@@ -936,6 +937,7 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` 
(uuid,hypervisor_type, hypervis
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Ubuntu Precise Pangolin 12.04 (32-bit)', 
163, utc_timestamp(), 0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Ubuntu Precise Pangolin 12.04 (64-bit)', 
164, utc_timestamp(), 0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Ubuntu Trusty Tahr 14.04', 241, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Ubuntu Trusty Tahr 14.04', 254, 
utc_timestamp(), 0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, create

[46/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-4807: tests for NetUtils

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f72548f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f72548f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f72548f

Branch: refs/heads/reporter
Commit: 1f72548f57fb76dca3b9542f232fc539bbfd1ea6
Parents: 57cd7f3
Author: Laszlo Hornyak 
Authored: Tue Mar 3 20:42:46 2015 +0100
Committer: Laszlo Hornyak 
Committed: Tue Mar 3 21:21:52 2015 +0100

--
 utils/src/com/cloud/utils/net/NetUtils.java | 24 ++--
 .../test/com/cloud/utils/net/NetUtilsTest.java  | 39 
 2 files changed, 52 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f72548f/utils/src/com/cloud/utils/net/NetUtils.java
--
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java 
b/utils/src/com/cloud/utils/net/NetUtils.java
index 8875bb9..cc48ef1 100644
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -373,7 +373,7 @@ public class NetUtils {
 }
 }
 
-public static long ip2Long(String ip) {
+public static long ip2Long(final String ip) {
 String[] tokens = ip.split("[.]");
 assert (tokens.length == 4);
 long result = 0;
@@ -388,8 +388,8 @@ public class NetUtils {
 return result;
 }
 
-public static String long2Ip(long ip) {
-StringBuilder result = new StringBuilder(15);
+public static String long2Ip(final long ip) {
+final StringBuilder result = new StringBuilder(15);
 result.append((ip >> 24 & 0xff)).append(".");
 result.append((ip >> 16 & 0xff)).append(".");
 result.append((ip >> 8 & 0xff)).append(".");
@@ -398,8 +398,8 @@ public class NetUtils {
 return result.toString();
 }
 
-public static long mac2Long(String macAddress) {
-String[] tokens = macAddress.split(":");
+public static long mac2Long(final String macAddress) {
+final String[] tokens = macAddress.split(":");
 assert (tokens.length == 6);
 long result = 0;
 for (int i = 0; i < tokens.length; i++) {
@@ -464,12 +464,14 @@ public class NetUtils {
 return result.toString();
 }
 
-public static String long2Mac(long macAddress) {
-StringBuilder result = new StringBuilder(17);
-Formatter formatter = new Formatter(result);
-formatter.format("%02x:%02x:%02x:%02x:%02x:%02x", (macAddress >> 40) & 
0xff, (macAddress >> 32) & 0xff, (macAddress >> 24) & 0xff, (macAddress >> 16) 
& 0xff,
-(macAddress >> 8) & 0xff, (macAddress & 0xff));
-formatter.close();
+public static String long2Mac(final long macAddress) {
+final StringBuilder result = new StringBuilder(17);
+try (Formatter formatter = new Formatter(result)) {
+formatter.format("%02x:%02x:%02x:%02x:%02x:%02x",
+(macAddress >> 40) & 0xff, (macAddress >> 32) & 0xff,
+(macAddress >> 24) & 0xff, (macAddress >> 16) & 0xff,
+(macAddress >> 8) & 0xff, (macAddress & 0xff));
+}
 return result.toString();
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f72548f/utils/test/com/cloud/utils/net/NetUtilsTest.java
--
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java 
b/utils/test/com/cloud/utils/net/NetUtilsTest.java
index 62476ea..c4eceab 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -303,4 +303,43 @@ public class NetUtilsTest {
 
 assertTrue(NetUtils.validateGuestCidr(guestCidr));
 }
+
+@Test
+public void testMac2Long() {
+assertEquals(0l, NetUtils.mac2Long("00:00:00:00:00:00"));
+assertEquals(1l, NetUtils.mac2Long("00:00:00:00:00:01"));
+assertEquals(0xFFl, NetUtils.mac2Long("00:00:00:00:00:FF"));
+assertEquals(0xFFAAl, NetUtils.mac2Long("00:00:00:00:FF:AA"));
+assertEquals(0x11FFAAl, NetUtils.mac2Long("00:00:00:11:FF:AA"));
+assertEquals(0x12345678l, NetUtils.mac2Long("00:00:12:34:56:78"));
+assertEquals(0x123456789Al, NetUtils.mac2Long("00:12:34:56:78:9A"));
+assertEquals(0x123456789ABCl, NetUtils.mac2Long("12:34:56:78:9A:BC"));
+}
+
+@Test
+public void testLong2Mac() {
+assertEquals("00:00:00:00:00:00", NetUtils.long2Mac(0l));
+assertEquals("00:00:00:00:00:01", NetUtils.long2Mac(1l));
+assertEquals("00:00:00:00:00:ff", NetUtils.long2Mac(0xFFl));
+assertEquals("00:00:00:00:ff:aa", NetUt

[31/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge branch 'master' of https://github.com/ghxandsky/cloudstack


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a831beb9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a831beb9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a831beb9

Branch: refs/heads/reporter
Commit: a831beb9820de2284bbaf5a20264cea4c14cdf76
Parents: 694a694 eaf7349
Author: Daan Hoogland 
Authored: Sat Feb 28 00:03:33 2015 +0100
Committer: Daan Hoogland 
Committed: Sat Feb 28 00:03:33 2015 +0100

--
 packaging/centos63/cloud.spec | 1 -
 packaging/centos7/cloud.spec  | 1 -
 packaging/fedora20/cloud.spec | 1 -
 packaging/fedora21/cloud.spec | 1 -
 packaging/package.sh  | 2 +-
 5 files changed, 1 insertion(+), 5 deletions(-)
--

[09/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge branch 'patch-1' of https://github.com/NuxRo/cloudstack


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc9461bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc9461bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc9461bd

Branch: refs/heads/reporter
Commit: cc9461bdb83047d2597605a9a6ca9b9c2975da7f
Parents: 76010d8 f06dc56
Author: Daan Hoogland 
Authored: Wed Feb 25 11:35:16 2015 +0100
Committer: Daan Hoogland 
Committed: Wed Feb 25 11:35:16 2015 +0100

--
 client/WEB-INF/classes/resources/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[49/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

listDirectory method updated to use ObjectListing.isTruncated().

Because buckets can contain a virtually unlimited number of keys, the
complete results of a list query can be extremely large. To manage large
result sets, Amazon S3 uses pagination to split them into multiple
responses.

Signed-off-by: Rajani Karuturi 

This closes #25


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b6c540a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b6c540a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b6c540a

Branch: refs/heads/reporter
Commit: 0b6c540a203453580bb76a0d0a60be292fccfa0e
Parents: 7c1590f
Author: santhosh 
Authored: Fri Oct 24 21:15:29 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Mar 4 12:52:48 2015 +0530

--
 utils/src/com/cloud/utils/S3Utils.java | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b6c540a/utils/src/com/cloud/utils/S3Utils.java
--
diff --git a/utils/src/com/cloud/utils/S3Utils.java 
b/utils/src/com/cloud/utils/S3Utils.java
index d9b850d..37aeb91 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -57,13 +57,14 @@ import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.model.Bucket;
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.GetObjectRequest;
+import com.amazonaws.services.s3.model.ListObjectsRequest;
+import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.amazonaws.services.s3.transfer.TransferManager;
 import com.amazonaws.services.s3.transfer.Upload;
-
 import com.cloud.utils.exception.CloudRuntimeException;
 
 public final class S3Utils {
@@ -338,9 +339,19 @@ public final class S3Utils {
 
 private static List listDirectory(final String 
bucketName, final String directory, final AmazonS3 client) {
 
-final List objects = client.listObjects(bucketName, 
directory + SEPARATOR).getObjectSummaries();
-
-if (objects == null) {
+List objects = new ArrayList();
+ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
+ObjectListing objectListing;
+
+do {
+   objectListing = client.listObjects(listObjectsRequest);
+   
+   if (objectListing != null )
+   objects.addAll(objectListing.getObjectSummaries());
+   listObjectsRequest.setMarker(objectListing.getNextMarker());
+} while (objectListing.isTruncated());
+
+if (objects.isEmpty()) {
 return emptyList();
 }

[33/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-7063, CLOUDSTACK-7064: Add security headers on HTTP response

- Adds X-XSS-Protection header
- Adds X-Content-Type-Options header
- Fixes to use json content type defined from global settings
- Uses secure cookie if enabled in global settings

Signed-off-by: Rohit Yadav 
(cherry picked from commit b6b3494782d8bc1033941b802380ba1d5ebd464c)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20bcb4b6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20bcb4b6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20bcb4b6

Branch: refs/heads/reporter
Commit: 20bcb4b673ea83dd3d4e301705425632daa226ca
Parents: 843c0f8
Author: Rohit Yadav 
Authored: Sat Feb 28 18:12:37 2015 +0530
Committer: Rohit Yadav 
Committed: Sat Feb 28 18:14:49 2015 +0530

--
 server/src/com/cloud/api/ApiServer.java| 21 -
 server/src/com/cloud/api/ApiServlet.java   | 24 ---
 server/src/com/cloud/configuration/Config.java | 15 +---
 utils/src/com/cloud/utils/HttpUtils.java   | 26 ++---
 4 files changed, 66 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20bcb4b6/server/src/com/cloud/api/ApiServer.java
--
diff --git a/server/src/com/cloud/api/ApiServer.java 
b/server/src/com/cloud/api/ApiServer.java
index daf24ef..cf719c0 100644
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -181,7 +181,8 @@ public class ApiServer extends ManagerBase implements 
HttpRequestHandler, ApiSer
 private static final Logger s_accessLogger = Logger.getLogger("apiserver." 
+ ApiServer.class.getName());
 
 public static boolean encodeApiResponse = false;
-public static String jsonContentType = "text/javascript";
+public static boolean s_enableSecureCookie = false;
+public static String s_jsonContentType = HttpUtils.JSON_CONTENT_TYPE;
 
 /**
  * Non-printable ASCII characters - numbers 0 to 31 and 127 decimal
@@ -362,9 +363,13 @@ public class ApiServer extends ManagerBase implements 
HttpRequestHandler, ApiSer
 }
 
 
setEncodeApiResponse(Boolean.valueOf(_configDao.getValue(Config.EncodeApiResponse.key(;
-final String jsonType = 
_configDao.getValue(Config.JavaScriptDefaultContentType.key());
+final String jsonType = 
_configDao.getValue(Config.JSONDefaultContentType.key());
 if (jsonType != null) {
-jsonContentType = jsonType;
+s_jsonContentType = jsonType;
+}
+final Boolean enableSecureSessionCookie = 
Boolean.valueOf(_configDao.getValue(Config.EnableSecureSessionCookie.key()));
+if (enableSecureSessionCookie != null) {
+s_enableSecureCookie = enableSecureSessionCookie;
 }
 
 if (apiPort != null) {
@@ -1136,7 +1141,7 @@ public class ApiServer extends ManagerBase implements 
HttpRequestHandler, ApiSer
 final BasicHttpEntity body = new BasicHttpEntity();
 if (HttpUtils.RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
 // JSON response
-body.setContentType(jsonContentType);
+body.setContentType(getJSONContentType());
 if (responseText == null) {
 body.setContent(new ByteArrayInputStream("{ \"error\" : { 
\"description\" : \"Internal Server Error\" } }".getBytes(HttpUtils.UTF_8)));
 }
@@ -1367,7 +1372,11 @@ public class ApiServer extends ManagerBase implements 
HttpRequestHandler, ApiSer
 ApiServer.encodeApiResponse = encodeApiResponse;
 }
 
-public static String getJsonContentType() {
-return jsonContentType;
+public static boolean isSecureSessionCookieEnabled() {
+return s_enableSecureCookie;
+}
+
+public static String getJSONContentType() {
+return s_jsonContentType;
 }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20bcb4b6/server/src/com/cloud/api/ApiServlet.java
--
diff --git a/server/src/com/cloud/api/ApiServlet.java 
b/server/src/com/cloud/api/ApiServlet.java
index 3c73375..5628d98 100644
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -155,12 +155,20 @@ public class ApiServlet extends HttpServlet {
 try {
 
 if (HttpUtils.RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
-resp.setContentType(HttpUtils.JSON_CONTENT_TYPE);
+resp.setContentType(ApiServer.getJSONContentType());
 } else if 
(HttpUtils.RESPONSE_TYPE_XML.equalsIgnoreCase(responseType)){

[43/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8265: added  foreign key constriant on guest os id


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/58c5850b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/58c5850b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/58c5850b

Branch: refs/heads/reporter
Commit: 58c5850beed8037c608e2b902004be6375ed0dae
Parents: ef99f01
Author: Abhinandan Prateek 
Authored: Tue Mar 3 01:45:48 2015 -0500
Committer: Abhinandan Prateek 
Committed: Tue Mar 3 02:25:09 2015 -0500

--
 setup/db/db/schema-442to450.sql | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58c5850b/setup/db/db/schema-442to450.sql
--
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index a1d9b0e..4a8f250 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -1024,3 +1024,4 @@ INSERT IGNORE INTO `cloud`.`configuration` (`category`, 
`instance`, `component`,
 
 UPDATE `cloud`.`configuration` SET description='Uuid of the service offering 
used by secondary storage; if NULL - system offering will be used' where 
name='secstorage.service.offering';
 
+ALTER TABLE `cloud`.`guest_os_hypervisor` ADD FOREIGN KEY (`guest_os_id`) 
REFERENCES `cloud`.`guest_os`(`id`);

[26/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

removed redundant autoboxing

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6e3a20b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6e3a20b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6e3a20b

Branch: refs/heads/reporter
Commit: e6e3a20bd6ef95d40af2018c74430a0b5f77166b
Parents: 5626a34
Author: Laszlo Hornyak 
Authored: Wed Feb 25 20:58:25 2015 +0100
Committer: Laszlo Hornyak 
Committed: Fri Feb 27 19:38:12 2015 +0100

--
 core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6e3a20b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
--
diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java 
b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
index e030545..1f8d4cf 100644
--- a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
@@ -77,7 +77,7 @@ public class SetFirewallRulesCommand extends 
NetworkElementCommand {
 if (cidr == null || cidr.isEmpty()) {
 sb.append("0.0.0.0/0");
 } else {
-Boolean firstEntry = true;
+boolean firstEntry = true;
 for (String tag : cidr) {
 if (!firstEntry)
 sb.append("-");

[36/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8294: fix for java 1.8 build

The test testFindSecurityProfileByUuid built an assumptio on the order of the 
arguments after transforming through a HashMap.

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/873649eb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/873649eb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/873649eb

Branch: refs/heads/reporter
Commit: 873649eb3b52f2ec25c0e60d2a2465f95c97e428
Parents: ed099c3
Author: Laszlo Hornyak 
Authored: Sun Mar 1 13:20:51 2015 +0100
Committer: Laszlo Hornyak 
Committed: Sun Mar 1 13:20:51 2015 +0100

--
 .../cloud/network/nicira/NiciraNvpApiTest.java  | 21 ++--
 1 file changed, 19 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/873649eb/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
--
diff --git 
a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
 
b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
index 51964bf..1435cc5 100644
--- 
a/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
+++ 
b/plugins/network-elements/nicira-nvp/test/com/cloud/network/nicira/NiciraNvpApiTest.java
@@ -20,12 +20,18 @@
 package com.cloud.network.nicira;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Matchers.any;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
@@ -38,10 +44,11 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.params.HttpClientParams;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
-
 import com.cloud.utils.rest.RESTServiceConnector;
 import com.cloud.utils.rest.RESTValidationStrategy;
 
@@ -144,13 +151,23 @@ public class NiciraNvpApiTest {
 new NameValuePair("uuid", UUID),
 new NameValuePair("fields","*")
 };
+final List queryStringNvps = new ArrayList<>();
+doAnswer(new Answer() {
+
+@Override
+public Void answer(InvocationOnMock invocation) throws Throwable {
+final NameValuePair[] arguments = (NameValuePair[]) 
invocation.getArguments()[0];
+queryStringNvps.addAll(Arrays.asList(arguments));
+return null;
+}}).when(method).setQueryString(any(NameValuePair[].class));
 
 // Execute
 final NiciraNvpList actualProfiles = 
api.findSecurityProfile(UUID);
 
 // Assert
 verify(method, times(1)).releaseConnection();
-verify(method, times(1)).setQueryString(queryString);
+assertTrue(queryStringNvps.containsAll(Arrays.asList(queryString)));
+assertEquals(queryString.length, queryStringNvps.size());
 assertEquals("Wrong Uuid in the newly created SecurityProfile",
 UUID, actualProfiles.getResults().get(0).getUuid());
 assertEquals("Wrong Uuid in the newly created SecurityProfile",

[07/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge branch 'CLOUDSTACK-8210_2' of https://github.com/K0zka/cloudstack


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76010d88
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76010d88
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76010d88

Branch: refs/heads/reporter
Commit: 76010d8871f259cccf0344b35ddaa49ffe686662
Parents: 4f9bc70 a9912a0
Author: Daan Hoogland 
Authored: Wed Feb 25 10:22:28 2015 +0100
Committer: Daan Hoogland 
Committed: Wed Feb 25 10:22:28 2015 +0100

--
 packaging/fedora20/cloud-agent.rc | 117 
 packaging/fedora20/cloud-ipallocator.rc   |  96 +++
 packaging/fedora20/cloud-management.rc| 115 
 packaging/fedora20/cloud-management.sysconfig |  23 +
 packaging/fedora20/cloud-usage.rc | 156 +
 packaging/fedora20/cloud.spec | 706 +
 packaging/fedora20/cloudstack-agent.te|  33 +
 packaging/fedora20/cloudstack-sccs|  20 +
 packaging/fedora20/replace.properties |  60 ++
 packaging/fedora20/tomcat.sh  |  18 +
 packaging/fedora21/cloud-agent.rc | 117 
 packaging/fedora21/cloud-ipallocator.rc   |  96 +++
 packaging/fedora21/cloud-management.rc| 115 
 packaging/fedora21/cloud-management.sysconfig |  23 +
 packaging/fedora21/cloud-usage.rc | 156 +
 packaging/fedora21/cloud.spec | 706 +
 packaging/fedora21/cloudstack-agent.te|  33 +
 packaging/fedora21/cloudstack-sccs|  20 +
 packaging/fedora21/replace.properties |  60 ++
 packaging/fedora21/tomcat.sh  |  18 +
 packaging/package.sh  |   2 +-
 21 files changed, 2689 insertions(+), 1 deletion(-)
--

[21/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-5237: Add a default PBKDF2-SHA-256 based authenticator

Signed-off-by: Rohit Yadav 
(cherry picked from commit 9533c54db669b22b268fcc21766e21c231e48d84)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6f4db0ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6f4db0ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6f4db0ce

Branch: refs/heads/reporter
Commit: 6f4db0ce4b493106eb4ac06737d3f2e9781ed535
Parents: d8e1bf1
Author: Rohit Yadav 
Authored: Fri Feb 27 15:45:06 2015 +0530
Committer: Rohit Yadav 
Committed: Fri Feb 27 15:53:58 2015 +0530

--
 client/pom.xml  |   5 +
 .../core/spring-core-registry-core-context.xml  |   4 +-
 plugins/pom.xml |   1 +
 plugins/user-authenticators/pbkdf2/pom.xml  |  29 
 .../cloudstack/pbkdf2/module.properties |  18 +++
 .../cloudstack/pbkdf2/spring-pbkdf2-context.xml |  32 +
 .../server/auth/PBKDF2UserAuthenticator.java| 143 +++
 .../server/auth/PBKD2UserAuthenticatorTest.java |  75 ++
 8 files changed, 305 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f4db0ce/client/pom.xml
--
diff --git a/client/pom.xml b/client/pom.xml
index 590a9ad..9453159 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -77,6 +77,11 @@
 
 
   org.apache.cloudstack
+  cloud-plugin-user-authenticator-pbkdf2
+  ${project.version}
+
+
+  org.apache.cloudstack
   cloud-plugin-user-authenticator-plaintext
   ${project.version}
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f4db0ce/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
--
diff --git 
a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml 
b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 939cffe..d967540 100644
--- 
a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ 
b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -33,7 +33,7 @@
 
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
 
 
-
+
 
 
 
 
 
-
+
 
 
 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f4db0ce/plugins/pom.xml
--
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 76119dc..962ce46 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -71,6 +71,7 @@
 storage-allocators/random
 user-authenticators/ldap
 user-authenticators/md5
+user-authenticators/pbkdf2
 user-authenticators/plain-text
 user-authenticators/saml2
 user-authenticators/sha256salted

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f4db0ce/plugins/user-authenticators/pbkdf2/pom.xml
--
diff --git a/plugins/user-authenticators/pbkdf2/pom.xml 
b/plugins/user-authenticators/pbkdf2/pom.xml
new file mode 100644
index 000..e656045
--- /dev/null
+++ b/plugins/user-authenticators/pbkdf2/pom.xml
@@ -0,0 +1,29 @@
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+  4.0.0
+  cloud-plugin-user-authenticator-pbkdf2
+  Apache CloudStack Plugin - User Authenticator PBKDF2-SHA-256
+  
+org.apache.cloudstack
+cloudstack-plugins
+4.5.0-SNAPSHOT
+../../pom.xml
+  
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f4db0ce/plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/module.properties
--
diff --git 
a/plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/module.properties
 
b/plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/module.properties
new file mode 100644
index 000..7c2b38d
--- /dev/null
+++ 
b/plugins/user-authenticators/pbkdf2/resources/META-INF/cloudstack/pbkdf2/module.properties
@@ -0,0 +1,18 @@
+# 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
+# wi

[20/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Support all pythons from 2.6 up.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d5e3d491
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d5e3d491
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d5e3d491

Branch: refs/heads/reporter
Commit: d5e3d4911dbb2d7620cf3d30ae780336ab7c9496
Parents: d8e1bf1
Author: Pierre-Yves Ritschard 
Authored: Fri Feb 27 09:26:13 2015 +0100
Committer: Pierre-Yves Ritschard 
Committed: Fri Feb 27 09:27:52 2015 +0100

--
 tools/apidoc/gen_toc.py | 54 +++-
 1 file changed, 28 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5e3d491/tools/apidoc/gen_toc.py
--
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index 95f06c8..3d48bc5 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -6,9 +6,9 @@
 # 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
@@ -131,7 +131,7 @@ known_categories = {
 'Project': 'Project',
 'Lun': 'Storage',
 'Pool': 'Pool',
-'VPC': 'VPC', 
+'VPC': 'VPC',
 'PrivateGateway': 'VPC',
 'Simulator': 'simulator',
 'StaticRoute': 'VPC',
@@ -177,7 +177,7 @@ categories = {}
 
 
 def choose_category(fn):
-for k, v in known_categories.iteritems():
+for k, v in known_categories.items():
 if k in fn:
 return v
 raise Exception('Need to add a category for %s to %s:known_categories' %
@@ -198,7 +198,8 @@ for f in sys.argv:
 if dirname.startswith('./'):
 dirname = dirname[2:]
 try:
-dom = minidom.parse(file(f))
+with open(f) as data:
+dom = minidom.parse(data)
 name = dom.getElementsByTagName('name')[0].firstChild.data
 isAsync = dom.getElementsByTagName('isAsync')[0].firstChild.data
 category = choose_category(fn)
@@ -210,11 +211,11 @@ for f in sys.argv:
 'async': isAsync == 'true',
 'user': dirname_to_user[dirname],
 })
-except ExpatError, e:
+except ExpatError as e:
 pass
-except IndexError, e:
-print fn
-
+except IndexError as e:
+print(fn)
+
 
 def xml_for(command):
 name = command['name']
@@ -227,9 +228,9 @@ def xml_for(command):
 
 
 def write_xml(out, user):
-with file(out, 'w') as f:
+with open(out, 'w') as f:
 cat_strings = []
-
+
 for category in categories.keys():
 strings = []
 for command in categories[category]:
@@ -244,24 +245,24 @@ def write_xml(out, user):
 i = 0
 for _1, category, all_strings in cat_strings:
 if i == 0:
-print >>f, ''
-print >>f, '''
+f.write('\n')
+f.write('''
 %(category)s
 
 
 %(all_strings)s
 
-  
+
 
 
-''' % locals()
+''' % locals())
 if i == 3:
-print >>f, ''
+f.write('\n')
 i = 0
 else:
 i += 1
 if i != 0:
-print >>f, ''
+f.write('\n')
 
 
 def java_for(command, user):
@@ -277,7 +278,7 @@ def java_for_user(user):
 for command in categories[category]:
 if command['user'] == user:
 strings.append(java_for(command, user))
-func = user_to_func[user]
+func = user_to_func[user]
 all_strings = ''.join(strings)
 return '''
 public void %(func)s() {
@@ -287,8 +288,8 @@ def java_for_user(user):
 
 
 def write_java(out):
-with file(out, 'w') as f:
-print >>f, '''/* Generated using gen_toc.py.  Do not edit. */
+with open(out, 'w') as f:
+f.write('''/* Generated using gen_toc.py.  Do not edit. */
 
 import java.util.HashSet;
 import java.util.Set;
@@ -299,14 +300,15 @@ public class XmlToHtmlConverterData {
Set domainAdminCommandNames = new HashSet();
Set userCommandNames = new HashSet();
 
-'''
-print >>f, java_for_user(REGULAR_USER)
-print >>f, java_for_user(ROOT_ADMIN)
-print >>f, java_for_user(DOMAIN_ADMIN)
+''')
+f.write(java_for_user(REGULAR_USER) + "\n");
+f.write(java_for_user(ROOT_ADMIN) + "\n")
+f.write(java_for_user(DOMAIN_ADMIN) + "\n")
 
-print >>f, '''
+f.write('''
 }
-'''
+
+''')
 
 
 write_xml('generatetocforuser_incl

[16/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

server: Add missing import, fixes build

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4dde4106
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4dde4106
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4dde4106

Branch: refs/heads/reporter
Commit: 4dde4106c0c37e0aa1597bfeac0cbd82c181dbe2
Parents: 6df2fe7
Author: Rohit Yadav 
Authored: Thu Feb 26 17:49:55 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 17:49:55 2015 +0530

--
 server/src/com/cloud/user/AccountManagerImpl.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4dde4106/server/src/com/cloud/user/AccountManagerImpl.java
--
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java 
b/server/src/com/cloud/user/AccountManagerImpl.java
index bced7b3..78a8733 100644
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -147,6 +147,7 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
+import java.net.InetAddress;
 import java.net.URLEncoder;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;

[06/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting

Signed-off-by: Rohit Yadav 
(cherry picked from commit b462a56f27b21455b70415ea03663af5cd62647e)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f9bc70b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f9bc70b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f9bc70b

Branch: refs/heads/reporter
Commit: 4f9bc70b1f777daeff5aeebd54144db50545e907
Parents: 6caee85
Author: Rohit Yadav 
Authored: Wed Feb 25 14:21:11 2015 +0530
Committer: Rohit Yadav 
Committed: Wed Feb 25 14:30:13 2015 +0530

--
 .../cloud/consoleproxy/AgentBasedConsoleProxyManager.java| 2 +-
 server/src/com/cloud/consoleproxy/ConsoleProxyManager.java   | 2 +-
 .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java  | 8 
 server/src/com/cloud/server/ManagementServerImpl.java| 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f9bc70b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
--
diff --git 
a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java 
b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
index 3a1c387..6824b9c 100644
--- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
@@ -175,7 +175,7 @@ public class AgentBasedConsoleProxyManager extends 
ManagerBase implements Consol
 }
 
 @Override
-public ConsoleProxyVO startProxy(long proxyVmId) {
+public ConsoleProxyVO startProxy(long proxyVmId, boolean 
ignoreRestartSetting) {
 return null;
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f9bc70b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
--
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java 
b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
index 9d22b7f..8496301 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java
@@ -40,7 +40,7 @@ public interface ConsoleProxyManager extends Manager, 
ConsoleProxyService {
 
 public void resumeLastManagementState();
 
-public ConsoleProxyVO startProxy(long proxyVmId);
+public ConsoleProxyVO startProxy(long proxyVmId, boolean 
ignoreRestartSetting);
 
 public boolean stopProxy(long proxyVmId);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f9bc70b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
--
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 
b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 0851a68..478aab1 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -520,7 +520,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 }
 
 @Override
-public ConsoleProxyVO startProxy(long proxyVmId) {
+public ConsoleProxyVO startProxy(long proxyVmId, boolean 
ignoreRestartSetting) {
 try {
 ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyVmId);
 if (proxy.getState() == VirtualMachine.State.Running) {
@@ -528,7 +528,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 }
 
 String restart = 
_configDao.getValue(Config.ConsoleProxyRestart.key());
-if (restart != null && restart.equalsIgnoreCase("false")) {
+if (!ignoreRestartSetting && restart != null && 
restart.equalsIgnoreCase("false")) {
 return null;
 }
 
@@ -912,7 +912,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 
 if (proxy != null) {
 long proxyVmId = proxy.getId();
-proxy = startProxy(proxyVmId);
+proxy = startProxy(proxyVmId, false);
 
 if (proxy != null) {
 if (s_logger.isInfoEnabled()) {
@@ -1134,7 +1134,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 return false;
 }
 } else {
-return startProxy(proxyVmId) != null;
+return startProxy(proxyVmId, false) != null;
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f9bc70b/server/src/com/cloud/server/ManagementServerImpl.

[02/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

db: use explicit USE statements to avoid SQL failures

create-schema-premium.sql may fail with certain MySQL/MariaDB version which
require explicit database use.

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09e26c82
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09e26c82
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09e26c82

Branch: refs/heads/reporter
Commit: 09e26c826f3942946a9e3cbd0c632fc0c7791e56
Parents: 245c325
Author: Rohit Yadav 
Authored: Mon Feb 23 02:00:18 2015 +0530
Committer: Rohit Yadav 
Committed: Mon Feb 23 02:00:18 2015 +0530

--
 setup/db/create-schema-premium.sql | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09e26c82/setup/db/create-schema-premium.sql
--
diff --git a/setup/db/create-schema-premium.sql 
b/setup/db/create-schema-premium.sql
index a8feff4..3c86710 100644
--- a/setup/db/create-schema-premium.sql
+++ b/setup/db/create-schema-premium.sql
@@ -16,6 +16,7 @@
 -- under the License.
 
 SET foreign_key_checks = 0;
+USE `cloud_usage`;
 DROP TABLE IF EXISTS `cloud_usage`.`cloud_usage`;
 DROP TABLE IF EXISTS `cloud_usage`.`usage_vm_instance`;
 DROP TABLE IF EXISTS `cloud_usage`.`usage_ip_address`;
@@ -282,6 +283,8 @@ ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX 
`i_usage_security_gro
 ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX 
`i_usage_security_group__created`(`created`);
 ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX 
`i_usage_security_group__deleted`(`deleted`);
 
+USE `cloud`;
+
 CREATE TABLE `cloud`.`netapp_volume` (
   `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
   `ip_address` varchar(255) NOT NULL COMMENT 'ip address/fqdn of the volume',

[38/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Merge remote-tracking branch 'exoscale/fix/python-support'

This closes #89

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62e179b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62e179b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62e179b1

Branch: refs/heads/reporter
Commit: 62e179b16d84cc12369ee9af17affe571abd0f29
Parents: a0eb144 d5e3d49
Author: Rohit Yadav 
Authored: Mon Mar 2 16:31:10 2015 +0530
Committer: Rohit Yadav 
Committed: Mon Mar 2 16:31:23 2015 +0530

--
 tools/apidoc/gen_toc.py | 54 +++-
 1 file changed, 28 insertions(+), 26 deletions(-)
--

[44/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8296 VMs cannot be migrated with XenMotion as network is not 
available.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/736c7d76
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/736c7d76
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/736c7d76

Branch: refs/heads/reporter
Commit: 736c7d7668796af96f223a2c6cd82aac6789a2ee
Parents: 58c5850
Author: Sanjay Tripathi 
Authored: Mon Mar 2 11:22:49 2015 +0530
Committer: Sanjay Tripathi 
Committed: Tue Mar 3 13:14:04 2015 +0530

--
 .../hypervisor/xenserver/resource/XenServer610Resource.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/736c7d76/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
index 5e3f95c..2283477 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
@@ -132,6 +132,12 @@ public class XenServer610Resource extends 
XenServer600Resource {
 
 try {
 prepareISO(connection, vmSpec.getName());
+
+// Get the list of networks and recreate VLAN, if required.
+for (NicTO nicTo : vmSpec.getNics()) {
+getNetwork(connection, nicTo);
+}
+
 Map other = new HashMap();
 other.put("live", "true");
 Network networkForSm = getNativeNetworkForTraffic(connection, 
TrafficType.Storage, null).getNetwork();

[32/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

scripts: use cloudmanagementserver.keystore instead of cloud.keystore

Signed-off-by: Rohit Yadav 
(cherry picked from commit f70afa1375dd353a68c3ee9be941a605025cfc04)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/843c0f89
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/843c0f89
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/843c0f89

Branch: refs/heads/reporter
Commit: 843c0f891b902f9c5c4192e672244e6aee2a4f71
Parents: a831beb
Author: Rohit Yadav 
Authored: Sat Feb 28 17:05:29 2015 +0530
Committer: Rohit Yadav 
Committed: Sat Feb 28 17:06:27 2015 +0530

--
 scripts/common/keys/ssl-keys.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/843c0f89/scripts/common/keys/ssl-keys.py
--
diff --git a/scripts/common/keys/ssl-keys.py b/scripts/common/keys/ssl-keys.py
index 074a777..d6804cc 100644
--- a/scripts/common/keys/ssl-keys.py
+++ b/scripts/common/keys/ssl-keys.py
@@ -33,7 +33,7 @@ import traceback
 def generateSSLKey(outputPath):
   logf = open("ssl-keys.log", "w")
   hostName = socket.gethostbyname(socket.gethostname())
-  keyFile = outputPath + os.sep + "cloud.keystore"
+  keyFile = outputPath + os.sep + "cloudmanagementserver.keystore"
   logf.write("HostName = %s\n" % hostName)
   logf.write("OutputPath = %s\n" % keyFile)
   dname='cn="Cloudstack User",ou="' + hostName + '",o="' + hostName + 
'",c="Unknown"';

[30/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

pbkdf2: fix encoding issue when converting byte[] to String

Signed-off-by: Rohit Yadav 
(cherry picked from commit 814e5574dcabbbf52b878d9fd448be7a66118597)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/694a6948
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/694a6948
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/694a6948

Branch: refs/heads/reporter
Commit: 694a6948600aec8584d02ab8dc00d6642b46e3c7
Parents: 3786aa0
Author: Rohit Yadav 
Authored: Sat Feb 28 00:42:27 2015 +0530
Committer: Rohit Yadav 
Committed: Sat Feb 28 00:44:20 2015 +0530

--
 .../apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/694a6948/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
--
diff --git 
a/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
 
b/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
index 43c32c7..58f5ea2 100644
--- 
a/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
+++ 
b/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java
@@ -133,8 +133,8 @@ public class PBKDF2UserAuthenticator extends 
DefaultUserAuthenticator {
 return !(plainPassword == null || plainPassword.isEmpty() || hash == 
null || hash.length == 0);
 }
 
-private static String encode(byte[] input) {
-return new String(Base64.encode(input));
+private static String encode(byte[] input) throws 
UnsupportedEncodingException {
+return new String(Base64.encode(input), "UTF-8");
 }
 
 private static byte[] decode(String input) throws 
UnsupportedEncodingException {

[14/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8277: Code improvement - test_shared_networks.py, 
test_multiple_ip_ranges.py

Signed-off-by: SrikanteswaraRao Talluri 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f3931993
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f3931993
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f3931993

Branch: refs/heads/reporter
Commit: f39319932576804eaafb9e51235290fdf23f3841
Parents: 429abe2
Author: Gaurav Aradhye 
Authored: Mon Feb 23 00:23:46 2015 -0800
Committer: SrikanteswaraRao Talluri 
Committed: Thu Feb 26 13:05:45 2015 +0530

--
 .../component/test_multiple_ips_per_nic.py  | 1492 +++
 .../component/test_shared_networks.py   | 2429 ++
 2 files changed, 2272 insertions(+), 1649 deletions(-)
--

[11/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

CLOUDSTACK-8276: Changes in Marvin to find free vlan in a setup when vlan is 
not returned for an existing network with listNetworks API

Signed-off-by: SrikanteswaraRao Talluri 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/429abe2b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/429abe2b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/429abe2b

Branch: refs/heads/reporter
Commit: 429abe2bd53147381f3be1d1eae37cef7f5894cc
Parents: e1827fc
Author: Gaurav Aradhye 
Authored: Sun Feb 22 23:44:33 2015 -0800
Committer: SrikanteswaraRao Talluri 
Committed: Thu Feb 26 13:04:20 2015 +0530

--
 tools/marvin/marvin/lib/common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/429abe2b/tools/marvin/marvin/lib/common.py
--
diff --git a/tools/marvin/marvin/lib/common.py 
b/tools/marvin/marvin/lib/common.py
index c59cf10..de6f146 100644
--- a/tools/marvin/marvin/lib/common.py
+++ b/tools/marvin/marvin/lib/common.py
@@ -977,9 +977,9 @@ def get_free_vlan(apiclient, zoneid):
 
 if isinstance(networks, list) and len(networks) > 0:
 usedVlanIds = [int(nw.vlan)
-   for nw in networks if nw.vlan != "untagged"]
+   for nw in networks if (nw.vlan and str(nw.vlan).lower() 
!= "untagged")]
 
-if hasattr(physical_network, "vlan") is False:
+if not hasattr(physical_network, "vlan"):
 while True:
 shared_ntwk_vlan = random.randrange(1, 4095)
 if shared_ntwk_vlan in usedVlanIds:

[27/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

Logical expression simplification, == true is redundant

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5626a340
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5626a340
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5626a340

Branch: refs/heads/reporter
Commit: 5626a340dd271ec585f973dfa99a2a7fb45abac3
Parents: 3786aa0
Author: Laszlo Hornyak 
Authored: Wed Feb 25 20:55:56 2015 +0100
Committer: Laszlo Hornyak 
Committed: Fri Feb 27 19:38:12 2015 +0100

--
 core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5626a340/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
--
diff --git a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java 
b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
index be85887..e030545 100644
--- a/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
+++ b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
@@ -53,7 +53,7 @@ public class SetFirewallRulesCommand extends 
NetworkElementCommand {
  *  each entry format  :protocol:srcport:destport:scidr:
  *  reverted entry format  :reverted:0:0:0:
  */
-if (fwTO.revoked() == true) {
+if (fwTO.revoked()) {
 StringBuilder sb = new StringBuilder();
 /* This entry is added just to make sure atleast there will 
one entry in the list to get the ipaddress */
 sb.append(fwTO.getSrcIp()).append(":reverted:0:0:0:");

[45/50] [abbrv] git commit: updated refs/heads/reporter to 178a938

2015-03-04 Thread widodh

LibvirtComputingResource: Support 'Oracle Linux 7' as pv guest

Change-Id: Ib3fd2fec7434564e937ac5b6b3cfee472a5fdc98


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57cd7f3d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57cd7f3d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57cd7f3d

Branch: refs/heads/reporter
Commit: 57cd7f3db54700e29a2a1f2fec0a99b0ea829d7b
Parents: 736c7d7
Author: Marcus Sorensen 
Authored: Tue Mar 3 10:44:12 2015 -0800
Committer: Marcus Sorensen 
Committed: Tue Mar 3 10:44:12 2015 -0800

--
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57cd7f3d/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
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 341c4f8..b6ac38c 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
@@ -4754,7 +4754,7 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 guestOSName.startsWith("CentOS 5.5") || 
guestOSName.startsWith("CentOS") || guestOSName.startsWith("Fedora") ||
 guestOSName.startsWith("Red Hat Enterprise Linux 5.3") || 
guestOSName.startsWith("Red Hat Enterprise Linux 5.4") ||
 guestOSName.startsWith("Red Hat Enterprise Linux 5.5") || 
guestOSName.startsWith("Red Hat Enterprise Linux 6") || 
guestOSName.startsWith("Debian GNU/Linux") ||
-guestOSName.startsWith("FreeBSD 10") || 
guestOSName.startsWith("Oracle Enterprise Linux") || 
guestOSName.startsWith("Other PV")) {
+guestOSName.startsWith("FreeBSD 10") || 
guestOSName.startsWith("Oracle") || guestOSName.startsWith("Other PV")) {
 return true;
 } else {
 return false;

git commit: updated refs/heads/master to c5c1b1d

2015-03-04 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/master 0b6c540a2 -> c5c1b1d46


Fixed checkstyle issues due to commit 0b6c540a203453580bb76a0d0a60be292fccfa0e


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5c1b1d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5c1b1d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5c1b1d4

Branch: refs/heads/master
Commit: c5c1b1d4628c5fc7a402586325c7bf937f42766e
Parents: 0b6c540
Author: Rajani Karuturi 
Authored: Wed Mar 4 16:21:53 2015 +0530
Committer: Rajani Karuturi 
Committed: Wed Mar 4 16:21:53 2015 +0530

--
 utils/src/com/cloud/utils/S3Utils.java | 22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5c1b1d4/utils/src/com/cloud/utils/S3Utils.java
--
diff --git a/utils/src/com/cloud/utils/S3Utils.java 
b/utils/src/com/cloud/utils/S3Utils.java
index 37aeb91..6784587 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -339,18 +339,16 @@ public final class S3Utils {
 
 private static List listDirectory(final String 
bucketName, final String directory, final AmazonS3 client) {
 
-List objects = new ArrayList();
-ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
-ObjectListing objectListing;
-
-do {
-   objectListing = client.listObjects(listObjectsRequest);
-   
-   if (objectListing != null )
-   objects.addAll(objectListing.getObjectSummaries());
-   listObjectsRequest.setMarker(objectListing.getNextMarker());
-} while (objectListing.isTruncated());
-
+ List objects = new ArrayList();
+ ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
+ ObjectListing objectListing;
+
+ do {
+  objectListing = client.listObjects(listObjectsRequest);
+  if (objectListing != null )
+objects.addAll(objectListing.getObjectSummaries());
+  listObjectsRequest.setMarker(objectListing.getNextMarker());
+ } while (objectListing.isTruncated());
 if (objects.isEmpty()) {
 return emptyList();
 }

git commit: updated refs/heads/4.3 to a17f2d1

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 d7988f17b -> a17f2d170


Add Dockerfile for simulator


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a17f2d17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a17f2d17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a17f2d17

Branch: refs/heads/4.3
Commit: a17f2d170730ef72926182026dfe8ff4bb86cd2d
Parents: d7988f1
Author: Sebastien Goasguen 
Authored: Wed Mar 4 11:56:24 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 11:56:24 2015 +0100

--
 Dockerfile   | 37 +
 supervisord.conf | 15 +++
 2 files changed, 52 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a17f2d17/Dockerfile
--
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000..ed2ca48
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+FROM ubuntu:14.04
+
+RUN apt-get -y update && apt-get install -y \
+genisoimage \
+git \
+maven \
+openjdk-7-jdk \
+python-dev \
+python-setuptools \
+python-pip \
+supervisor
+
+RUN echo 'mysql-server mysql-server/root_password password root' |  
debconf-set-selections; \
+echo 'mysql-server mysql-server/root_password_again password root' |  
debconf-set-selections;
+
+RUN apt-get install -qqy mysql-server && \
+apt-get clean all
+
+RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
+
+RUN pip install --allow-external mysql-connector-python mysql-connector-python
+
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY . ./root
+WORKDIR /root
+
+RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
+
+RUN (/usr/bin/mysqld_safe &); \
+sleep 3; \
+mvn -Pdeveloper -pl developer -Ddeploydb; \
+mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
+pip install tools/marvin/dist/Marvin-0.1.0.tar.gz
+
+EXPOSE 8080
+
+CMD ["/usr/bin/supervisord"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a17f2d17/supervisord.conf
--
diff --git a/supervisord.conf b/supervisord.conf
new file mode 100644
index 000..a3e454b
--- /dev/null
+++ b/supervisord.conf
@@ -0,0 +1,15 @@
+[supervisord]
+nodaemon=true
+
+[program:mysqld]
+command=/usr/bin/mysqld_safe
+autostart=true
+autorestart=true
+user=root
+
+[program:cloudstack]
+command=/bin/bash -c "mvn -pl client jetty:run -Dsimulator"
+directory=/root
+stderr_logfile=/var/log/acs.err.log
+stdout_logfile=/var/log/acs.out.log
+user=root

git commit: updated refs/heads/4.4 to a411015

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 10bb8af34 -> a41101572


Add Dockerfile for simulator


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4110157
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4110157
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4110157

Branch: refs/heads/4.4
Commit: a41101572691503bbcb57aba355049cf399356dc
Parents: 10bb8af
Author: Sebastien Goasguen 
Authored: Wed Mar 4 11:56:24 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 11:58:13 2015 +0100

--
 Dockerfile   | 37 +
 supervisord.conf | 15 +++
 2 files changed, 52 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4110157/Dockerfile
--
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000..ed2ca48
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+FROM ubuntu:14.04
+
+RUN apt-get -y update && apt-get install -y \
+genisoimage \
+git \
+maven \
+openjdk-7-jdk \
+python-dev \
+python-setuptools \
+python-pip \
+supervisor
+
+RUN echo 'mysql-server mysql-server/root_password password root' |  
debconf-set-selections; \
+echo 'mysql-server mysql-server/root_password_again password root' |  
debconf-set-selections;
+
+RUN apt-get install -qqy mysql-server && \
+apt-get clean all
+
+RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
+
+RUN pip install --allow-external mysql-connector-python mysql-connector-python
+
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY . ./root
+WORKDIR /root
+
+RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
+
+RUN (/usr/bin/mysqld_safe &); \
+sleep 3; \
+mvn -Pdeveloper -pl developer -Ddeploydb; \
+mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
+pip install tools/marvin/dist/Marvin-0.1.0.tar.gz
+
+EXPOSE 8080
+
+CMD ["/usr/bin/supervisord"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4110157/supervisord.conf
--
diff --git a/supervisord.conf b/supervisord.conf
new file mode 100644
index 000..a3e454b
--- /dev/null
+++ b/supervisord.conf
@@ -0,0 +1,15 @@
+[supervisord]
+nodaemon=true
+
+[program:mysqld]
+command=/usr/bin/mysqld_safe
+autostart=true
+autorestart=true
+user=root
+
+[program:cloudstack]
+command=/bin/bash -c "mvn -pl client jetty:run -Dsimulator"
+directory=/root
+stderr_logfile=/var/log/acs.err.log
+stdout_logfile=/var/log/acs.out.log
+user=root

git commit: updated refs/heads/master to 1b05de0

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/master c5c1b1d46 -> 1b05de04b


Add Dockerfile for simulator


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b05de04
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b05de04
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b05de04

Branch: refs/heads/master
Commit: 1b05de04bd150cb6118c28f041798b62fa1f27df
Parents: c5c1b1d
Author: Sebastien Goasguen 
Authored: Wed Mar 4 11:56:24 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 11:59:03 2015 +0100

--
 Dockerfile   | 37 +
 supervisord.conf | 15 +++
 2 files changed, 52 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b05de04/Dockerfile
--
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000..ed2ca48
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+FROM ubuntu:14.04
+
+RUN apt-get -y update && apt-get install -y \
+genisoimage \
+git \
+maven \
+openjdk-7-jdk \
+python-dev \
+python-setuptools \
+python-pip \
+supervisor
+
+RUN echo 'mysql-server mysql-server/root_password password root' |  
debconf-set-selections; \
+echo 'mysql-server mysql-server/root_password_again password root' |  
debconf-set-selections;
+
+RUN apt-get install -qqy mysql-server && \
+apt-get clean all
+
+RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
+
+RUN pip install --allow-external mysql-connector-python mysql-connector-python
+
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY . ./root
+WORKDIR /root
+
+RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
+
+RUN (/usr/bin/mysqld_safe &); \
+sleep 3; \
+mvn -Pdeveloper -pl developer -Ddeploydb; \
+mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
+pip install tools/marvin/dist/Marvin-0.1.0.tar.gz
+
+EXPOSE 8080
+
+CMD ["/usr/bin/supervisord"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b05de04/supervisord.conf
--
diff --git a/supervisord.conf b/supervisord.conf
new file mode 100644
index 000..a3e454b
--- /dev/null
+++ b/supervisord.conf
@@ -0,0 +1,15 @@
+[supervisord]
+nodaemon=true
+
+[program:mysqld]
+command=/usr/bin/mysqld_safe
+autostart=true
+autorestart=true
+user=root
+
+[program:cloudstack]
+command=/bin/bash -c "mvn -pl client jetty:run -Dsimulator"
+directory=/root
+stderr_logfile=/var/log/acs.err.log
+stdout_logfile=/var/log/acs.out.log
+user=root

git commit: updated refs/heads/4.5 to 9562175

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 def4a5ef5 -> 9562175ca


Add Dockerfile for simulator


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9562175c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9562175c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9562175c

Branch: refs/heads/4.5
Commit: 9562175ca7b36d6d5feeefd35e837cc888d79c06
Parents: def4a5e
Author: Sebastien Goasguen 
Authored: Wed Mar 4 11:56:24 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 12:00:32 2015 +0100

--
 Dockerfile   | 37 +
 supervisord.conf | 15 +++
 2 files changed, 52 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9562175c/Dockerfile
--
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000..ed2ca48
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+FROM ubuntu:14.04
+
+RUN apt-get -y update && apt-get install -y \
+genisoimage \
+git \
+maven \
+openjdk-7-jdk \
+python-dev \
+python-setuptools \
+python-pip \
+supervisor
+
+RUN echo 'mysql-server mysql-server/root_password password root' |  
debconf-set-selections; \
+echo 'mysql-server mysql-server/root_password_again password root' |  
debconf-set-selections;
+
+RUN apt-get install -qqy mysql-server && \
+apt-get clean all
+
+RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
+
+RUN pip install --allow-external mysql-connector-python mysql-connector-python
+
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY . ./root
+WORKDIR /root
+
+RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
+
+RUN (/usr/bin/mysqld_safe &); \
+sleep 3; \
+mvn -Pdeveloper -pl developer -Ddeploydb; \
+mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
+pip install tools/marvin/dist/Marvin-0.1.0.tar.gz
+
+EXPOSE 8080
+
+CMD ["/usr/bin/supervisord"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9562175c/supervisord.conf
--
diff --git a/supervisord.conf b/supervisord.conf
new file mode 100644
index 000..a3e454b
--- /dev/null
+++ b/supervisord.conf
@@ -0,0 +1,15 @@
+[supervisord]
+nodaemon=true
+
+[program:mysqld]
+command=/usr/bin/mysqld_safe
+autostart=true
+autorestart=true
+user=root
+
+[program:cloudstack]
+command=/bin/bash -c "mvn -pl client jetty:run -Dsimulator"
+directory=/root
+stderr_logfile=/var/log/acs.err.log
+stdout_logfile=/var/log/acs.out.log
+user=root

[2/5] git commit: updated refs/heads/4.5 to 1f97f94

2015-03-04 Thread bhaisaab

kvm: Check the return value of the cloudstack-setup-agent command

Bug-Url: https://issues.apache.org/jira/browse/CLOUDSTACK-8016
Signed-off-by: Laszlo Hornyak 
Signed-off-by: Rajani Karuturi 

This closes #93

(cherry picked from commit 7c1590ffd67b74f52fe374b0fb91f8c1ef731c39)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8e6fbb8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8e6fbb8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8e6fbb8

Branch: refs/heads/4.5
Commit: c8e6fbb8129818d980e06560e136e96a0111efd9
Parents: dd6bcde
Author: Laszlo Hornyak 
Authored: Sat Jan 17 22:09:16 2015 +0100
Committer: Rohit Yadav 
Committed: Wed Mar 4 16:56:48 2015 +0530

--
 .../hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java| 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8e6fbb8/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
--
diff --git 
a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java 
b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
index d475f4d..350b9a7 100644
--- 
a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
+++ 
b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -205,7 +205,12 @@ public abstract class LibvirtServerDiscoverer extends 
DiscovererBase implements
 parameters += " --guestNic=" + kvmGuestNic;
 parameters += " --hypervisor=" + 
cluster.getHypervisorType().toString().toLowerCase();
 
-SSHCmdHelper.sshExecuteCmd(sshConnection, "cloudstack-setup-agent 
" + parameters, 3);
+if (!SSHCmdHelper.sshExecuteCmd(sshConnection,
+"cloudstack-setup-agent " + parameters, 3)) {
+s_logger.info("cloudstack agent setup command failed: "
++ "cloudstack-setup-agent " + parameters);
+return null;
+}
 
 KvmDummyResourceBase kvmResource = new KvmDummyResourceBase();
 Map params = new HashMap();

[4/5] git commit: updated refs/heads/4.5 to 1f97f94

2015-03-04 Thread bhaisaab

listDirectory method updated to use ObjectListing.isTruncated().

Because buckets can contain a virtually unlimited number of keys, the
complete results of a list query can be extremely large. To manage large
result sets, Amazon S3 uses pagination to split them into multiple
responses.

Signed-off-by: Rajani Karuturi 

This closes #25

(cherry picked from commit 0b6c540a203453580bb76a0d0a60be292fccfa0e)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0ae5912f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0ae5912f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0ae5912f

Branch: refs/heads/4.5
Commit: 0ae5912f0019b9ea4c496ea138ecb57fc840ef23
Parents: 8069b17
Author: santhosh 
Authored: Fri Oct 24 21:15:29 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Mar 4 16:59:12 2015 +0530

--
 utils/src/com/cloud/utils/S3Utils.java | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ae5912f/utils/src/com/cloud/utils/S3Utils.java
--
diff --git a/utils/src/com/cloud/utils/S3Utils.java 
b/utils/src/com/cloud/utils/S3Utils.java
index d9b850d..37aeb91 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -57,13 +57,14 @@ import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.model.Bucket;
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.GetObjectRequest;
+import com.amazonaws.services.s3.model.ListObjectsRequest;
+import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.amazonaws.services.s3.transfer.TransferManager;
 import com.amazonaws.services.s3.transfer.Upload;
-
 import com.cloud.utils.exception.CloudRuntimeException;
 
 public final class S3Utils {
@@ -338,9 +339,19 @@ public final class S3Utils {
 
 private static List listDirectory(final String 
bucketName, final String directory, final AmazonS3 client) {
 
-final List objects = client.listObjects(bucketName, 
directory + SEPARATOR).getObjectSummaries();
-
-if (objects == null) {
+List objects = new ArrayList();
+ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
+ObjectListing objectListing;
+
+do {
+   objectListing = client.listObjects(listObjectsRequest);
+   
+   if (objectListing != null )
+   objects.addAll(objectListing.getObjectSummaries());
+   listObjectsRequest.setMarker(objectListing.getNextMarker());
+} while (objectListing.isTruncated());
+
+if (objects.isEmpty()) {
 return emptyList();
 }

[1/5] git commit: updated refs/heads/4.5 to 1f97f94

2015-03-04 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 9562175ca -> 1f97f9404


CLOUDSTACK-8298: Update copying large size VR config file in xenserver

 When there is large size VR configuration (aggregate commands) copying data to 
VR using vmops plugin was failed
 because of the ARG_MAX size limitation. The configuration data size is around 
300KB.

 Updated this to create file in host by scp with file contents. This will 
create file in host.
 Then copy the file from the host to VR using hte vmops createFileInDomr method.

  In host file get created in /tmp/ with name VR-.cfg, once it copied to 
VR this file will be removed.

(cherry picked from commit 619f0142555d2245e3fa90036f825525191b31bd)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd6bcde6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd6bcde6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd6bcde6

Branch: refs/heads/4.5
Commit: dd6bcde65b3aea47faa5884d22846070b00cf6bd
Parents: 9562175
Author: Jayapal 
Authored: Mon Feb 23 13:51:20 2015 +0530
Committer: Rohit Yadav 
Committed: Wed Mar 4 16:56:07 2015 +0530

--
 .../xenserver/resource/CitrixResourceBase.java  | 14 ++---
 scripts/vm/hypervisor/xenserver/vmops   | 21 +---
 2 files changed, 20 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd6bcde6/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index f200178..f24b214 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -571,9 +571,17 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 @Override
 public ExecutionResult createFileInVR(String routerIp, String path, String 
filename, String content) {
 Connection conn = getConnection();
-String rc = callHostPlugin(conn, "vmops", "createFileInDomr", 
"domrip", routerIp, "filepath", path + filename, "filecontents", content);
-s_logger.debug ("VR Config file " + filename + " got created in VR 
with ip " + routerIp + " with content \n" + content);
-// Fail case would be start with "fail#"
+String hostPath = "/tmp/";
+
+s_logger.debug("Copying VR with ip " + routerIp +" config file into 
host "+ _host.ip );
+try {
+SshHelper.scpTo(_host.ip, 22, _username, null, _password.peek(), 
hostPath, content.getBytes(), filename, null);
+} catch (Exception e) {
+s_logger.warn("scp VR config file into host " + _host.ip + " 
failed with exception " + e.getMessage().toString());
+}
+
+String rc = callHostPlugin(conn, "vmops", "createFileInDomr", 
"domrip", routerIp, "srcfilepath", hostPath + filename, "dstfilepath", path);
+s_logger.debug ("VR Config file " + filename + " got created in VR, ip 
" + routerIp + " with content \n" + content);
 return new ExecutionResult(rc.startsWith("succ#"), rc.substring(5));
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd6bcde6/scripts/vm/hypervisor/xenserver/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops 
b/scripts/vm/hypervisor/xenserver/vmops
index 59ede97..8abddff 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -215,20 +215,17 @@ def createFile(session, args):
 
 @echo
 def createFileInDomr(session, args):
-file_path = args['filepath']
-file_contents = args['filecontents']
+src_filepath = args['srcfilepath']
+dst_path = args['dstfilepath']
 domrip = args['domrip']
+txt=""
 try:
-tmpfile = util.pread2(['mktemp']).strip()
-f = open(tmpfile, "w")
-f.write(file_contents)
-f.close()
-target = "root@" + domrip + ":" + file_path
-txt = 
util.pread2(['scp','-P','3922','-q','-o','StrictHostKeyChecking=no','-i','/root/.ssh/id_rsa.cloud',tmpfile,
 target])
-util.pread2(['rm',tmpfile])
+target = "root@" + domrip + ":" + dst_path
+txt = 
util.pread2(['scp','-P','3922','-q','-o','StrictHostKeyChecking=no','-i','/root/.ssh/id_rsa.cloud',src_filepath,
 target])
+util.pread2(['rm',src_filepath])
 txt = 'succ#' + txt
 except:
-

[3/5] git commit: updated refs/heads/4.5 to 1f97f94

2015-03-04 Thread bhaisaab

CLOUDSTACK-8296 VMs cannot be migrated with XenMotion as network is not 
available.

(cherry picked from commit 736c7d7668796af96f223a2c6cd82aac6789a2ee)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8069b172
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8069b172
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8069b172

Branch: refs/heads/4.5
Commit: 8069b172504ff2e66d092cfaf02cdd29dd03e849
Parents: c8e6fbb
Author: Sanjay Tripathi 
Authored: Mon Mar 2 11:22:49 2015 +0530
Committer: Rohit Yadav 
Committed: Wed Mar 4 16:59:12 2015 +0530

--
 .../hypervisor/xenserver/resource/XenServer610Resource.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8069b172/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
index 5e3f95c..2283477 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer610Resource.java
@@ -132,6 +132,12 @@ public class XenServer610Resource extends 
XenServer600Resource {
 
 try {
 prepareISO(connection, vmSpec.getName());
+
+// Get the list of networks and recreate VLAN, if required.
+for (NicTO nicTo : vmSpec.getNics()) {
+getNetwork(connection, nicTo);
+}
+
 Map other = new HashMap();
 other.put("live", "true");
 Network networkForSm = getNativeNetworkForTraffic(connection, 
TrafficType.Storage, null).getNetwork();

[5/5] git commit: updated refs/heads/4.5 to 1f97f94

2015-03-04 Thread bhaisaab

Fixed checkstyle issues due to commit 0b6c540a203453580bb76a0d0a60be292fccfa0e

(cherry picked from commit c5c1b1d4628c5fc7a402586325c7bf937f42766e)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f97f940
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f97f940
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f97f940

Branch: refs/heads/4.5
Commit: 1f97f940467f9c603bfef99c1162d8e2ec0e1a5f
Parents: 0ae5912
Author: Rajani Karuturi 
Authored: Wed Mar 4 16:21:53 2015 +0530
Committer: Rohit Yadav 
Committed: Wed Mar 4 16:59:13 2015 +0530

--
 utils/src/com/cloud/utils/S3Utils.java | 22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f97f940/utils/src/com/cloud/utils/S3Utils.java
--
diff --git a/utils/src/com/cloud/utils/S3Utils.java 
b/utils/src/com/cloud/utils/S3Utils.java
index 37aeb91..6784587 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -339,18 +339,16 @@ public final class S3Utils {
 
 private static List listDirectory(final String 
bucketName, final String directory, final AmazonS3 client) {
 
-List objects = new ArrayList();
-ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
-ObjectListing objectListing;
-
-do {
-   objectListing = client.listObjects(listObjectsRequest);
-   
-   if (objectListing != null )
-   objects.addAll(objectListing.getObjectSummaries());
-   listObjectsRequest.setMarker(objectListing.getNextMarker());
-} while (objectListing.isTruncated());
-
+ List objects = new ArrayList();
+ ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
+ ObjectListing objectListing;
+
+ do {
+  objectListing = client.listObjects(listObjectsRequest);
+  if (objectListing != null )
+objects.addAll(objectListing.getObjectSummaries());
+  listObjectsRequest.setMarker(objectListing.getNextMarker());
+ } while (objectListing.isTruncated());
 if (objects.isEmpty()) {
 return emptyList();
 }

git commit: updated refs/heads/4.3 to 6fece62

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 a17f2d170 -> 6fece6278


exclude Dockerfile and supervisord.conf from RAT


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6fece627
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6fece627
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6fece627

Branch: refs/heads/4.3
Commit: 6fece627882edb3d53647690ebd913c93977497c
Parents: a17f2d1
Author: Sebastien Goasguen 
Authored: Wed Mar 4 12:35:26 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 12:35:26 2015 +0100

--
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fece627/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1468ad7..ff07d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   4.3.2
   pom
   Apache CloudStack
-  Apache CloudStack is an IaaS (âInfrastracture as a 
Serviceâ) cloud orchestration platform.
+  Apache CloudStack is an IaaS (âInfrastructure as a 
Serviceâ) cloud orchestration platform.
   http://www.cloudstack.org
   
 
scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git
@@ -552,6 +552,8 @@
   CHANGES
   CHANGES.md
   INSTALL.md
+  Dockerfile
+  supervisord.conf
   .idea/
   **/*.log
   **/*.patch

git commit: updated refs/heads/4.4 to 2504ea4

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 a41101572 -> 2504ea499


exclude Dockerfile and supervisord.conf from RAT


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2504ea49
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2504ea49
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2504ea49

Branch: refs/heads/4.4
Commit: 2504ea499d8dcc8fa51779cadd3f06f2bec15454
Parents: a411015
Author: Sebastien Goasguen 
Authored: Wed Mar 4 12:37:52 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 12:37:52 2015 +0100

--
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2504ea49/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d91d4f0..88f780f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   4.4.3-SNAPSHOT
   pom
   Apache CloudStack
-  Apache CloudStack is an IaaS (âInfrastracture as a 
Serviceâ) cloud orchestration platform.
+  Apache CloudStack is an IaaS (âInfrastructure as a 
Serviceâ) cloud orchestration platform.
   http://www.cloudstack.org
   
 
scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git
@@ -706,6 +706,8 @@
   CHANGES.md
   README.md
   INSTALL.md
+  Dockerfile
+  supervisord.conf
   .idea/
   **/*.log
   **/*.patch

git commit: updated refs/heads/4.4 to 212b34f

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 2504ea499 -> 212b34f08


Fix Marvin version in Dockerfile


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/212b34f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/212b34f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/212b34f0

Branch: refs/heads/4.4
Commit: 212b34f08bfc2583bd824fb391acbec3caa249a8
Parents: 2504ea4
Author: Sebastien Goasguen 
Authored: Wed Mar 4 12:51:36 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 12:51:36 2015 +0100

--
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/212b34f0/Dockerfile
--
diff --git a/Dockerfile b/Dockerfile
index ed2ca48..96e618e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ RUN (/usr/bin/mysqld_safe &); \
 sleep 3; \
 mvn -Pdeveloper -pl developer -Ddeploydb; \
 mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
-pip install tools/marvin/dist/Marvin-0.1.0.tar.gz
+pip install tools/marvin/dist/Marvin-4.4.1.tar.gz
 
 EXPOSE 8080

git commit: updated refs/heads/master to ccb38c8

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/master 1b05de04b -> ccb38c8d5


Fix RAT issues due to new Dockerfile


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ccb38c8d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ccb38c8d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ccb38c8d

Branch: refs/heads/master
Commit: ccb38c8d5e539a922994eaae0fddfe0cd28ef431
Parents: 1b05de0
Author: Sebastien Goasguen 
Authored: Wed Mar 4 13:00:08 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 13:00:08 2015 +0100

--
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccb38c8d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 66fe7f7..652c1d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -716,6 +716,8 @@
   CHANGES.md
   README.md
   INSTALL.md
+  Dockerfile
+  supervisord.conf
   .idea/
   **/*.log
   **/*.patch

svn commit: r8169 - /dev/cloudstack/cloudmonkey-5.3.1/ /release/cloudstack/releases/cloudmonkey-5.3.1/

2015-03-04 Thread duffy

Author: duffy
Date: Wed Mar  4 12:17:26 2015
New Revision: 8169

Log:
Publishing CloudMonkey 5.3.1 release

Added:
release/cloudstack/releases/cloudmonkey-5.3.1/
  - copied from r8168, dev/cloudstack/cloudmonkey-5.3.1/
Removed:
dev/cloudstack/cloudmonkey-5.3.1/

git commit: updated refs/heads/master to 83e9a0a

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/master ccb38c8d5 -> 83e9a0a80


Fix marvin version in Dockerfile


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83e9a0a8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83e9a0a8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/83e9a0a8

Branch: refs/heads/master
Commit: 83e9a0a80a70a54ce51b31dca0fe4b2c5c89fffe
Parents: ccb38c8
Author: Sebastien Goasguen 
Authored: Wed Mar 4 13:43:25 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 13:43:25 2015 +0100

--
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83e9a0a8/Dockerfile
--
diff --git a/Dockerfile b/Dockerfile
index ed2ca48..66862cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ RUN (/usr/bin/mysqld_safe &); \
 sleep 3; \
 mvn -Pdeveloper -pl developer -Ddeploydb; \
 mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
-pip install tools/marvin/dist/Marvin-0.1.0.tar.gz
+pip install tools/marvin/dist/Marvin-4.6.0-SNAPSHOT.tar.gz
 
 EXPOSE 8080

git commit: updated refs/heads/4.5 to 76674c4

2015-03-04 Thread sebgoa

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 1f97f9404 -> 76674c40d


Fix marvin version in Dockerfile


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76674c40
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76674c40
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76674c40

Branch: refs/heads/4.5
Commit: 76674c40d4b25766901cc6dce18398897ee544f9
Parents: 1f97f94
Author: Sebastien Goasguen 
Authored: Wed Mar 4 14:48:57 2015 +0100
Committer: Sebastien Goasguen 
Committed: Wed Mar 4 14:48:57 2015 +0100

--
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76674c40/Dockerfile
--
diff --git a/Dockerfile b/Dockerfile
index ed2ca48..f15d818 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ RUN (/usr/bin/mysqld_safe &); \
 sleep 3; \
 mvn -Pdeveloper -pl developer -Ddeploydb; \
 mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
-pip install tools/marvin/dist/Marvin-0.1.0.tar.gz
+pip install tools/marvin/dist/Marvin-4.5.0-SNAPSHOT.tar.gz
 
 EXPOSE 8080

svn commit: r1664050 - /cloudstack/site/trunk/content/archives.mdtext

2015-03-04 Thread bhaisaab

Author: bhaisaab
Date: Wed Mar  4 15:39:35 2015
New Revision: 1664050

URL: http://svn.apache.org/r1664050
Log:
Add CloudMonkey 5.3.0 to archives

Modified:
cloudstack/site/trunk/content/archives.mdtext

Modified: cloudstack/site/trunk/content/archives.mdtext
URL: 
http://svn.apache.org/viewvc/cloudstack/site/trunk/content/archives.mdtext?rev=1664050&r1=1664049&r2=1664050&view=diff
==
--- cloudstack/site/trunk/content/archives.mdtext (original)
+++ cloudstack/site/trunk/content/archives.mdtext Wed Mar  4 15:39:35 2015
@@ -13,6 +13,7 @@
 
 CloudMonkey release archives
 
+* 
[apache-cloudstack-cloudmonkey-5.3.0](http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/)
 * 
[apache-cloudstack-cloudmonkey-5.2.0](http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.2.0/)
 * 
[apache-cloudstack-cloudmonkey-5.1.0](http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.1.0/)
 * 
[apache-cloudstack-cloudmonkey-5.0.0](http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.0.0/)

svn commit: r942322 - in /websites/staging/cloudstack/trunk/content: ./ archives.html

2015-03-04 Thread buildbot

Author: buildbot
Date: Wed Mar  4 15:42:09 2015
New Revision: 942322

Log:
Staging update by buildbot for cloudstack

Modified:
websites/staging/cloudstack/trunk/content/   (props changed)
websites/staging/cloudstack/trunk/content/archives.html

Propchange: websites/staging/cloudstack/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar  4 15:42:09 2015
@@ -1 +1 @@
-1662006
+1664050

Modified: websites/staging/cloudstack/trunk/content/archives.html
==
--- websites/staging/cloudstack/trunk/content/archives.html (original)
+++ websites/staging/cloudstack/trunk/content/archives.html Wed Mar  4 15:42:09 
2015
@@ -138,6 +138,7 @@
 CloudMonkey release archives
 
 
+http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/";>apache-cloudstack-cloudmonkey-5.3.0
 http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.2.0/";>apache-cloudstack-cloudmonkey-5.2.0
 http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.1.0/";>apache-cloudstack-cloudmonkey-5.1.0
 http://archive.apache.org/dist/cloudstack/releases/cloudmonkey-5.0.0/";>apache-cloudstack-cloudmonkey-5.0.0

svn commit: r942323 - /websites/production/cloudstack/content/

2015-03-04 Thread bhaisaab

Author: bhaisaab
Date: Wed Mar  4 15:49:20 2015
New Revision: 942323

Log:
Publishing svnmucc operation to cloudstack site by bhaisaab

Added:
websites/production/cloudstack/content/
  - copied from r942322, websites/staging/cloudstack/trunk/content/

svn commit: r1664058 - /cloudstack/site/trunk/content/downloads.mdtext

2015-03-04 Thread bhaisaab

Author: bhaisaab
Date: Wed Mar  4 15:55:38 2015
New Revision: 1664058

URL: http://svn.apache.org/r1664058
Log:
Update CloudMonkey's latest release 5.3.1

Modified:
cloudstack/site/trunk/content/downloads.mdtext

Modified: cloudstack/site/trunk/content/downloads.mdtext
URL: 
http://svn.apache.org/viewvc/cloudstack/site/trunk/content/downloads.mdtext?rev=1664058&r1=1664057&r2=1664058&view=diff
==
--- cloudstack/site/trunk/content/downloads.mdtext (original)
+++ cloudstack/site/trunk/content/downloads.mdtext Wed Mar  4 15:55:38 2015
@@ -150,15 +150,15 @@ Apache CloudStack's CloudMonkey tool is
 
  Source Release
 
-CloudMonkey's most current release is 5.3.0.
+CloudMonkey's most current release is 5.3.1.
 
 
-http://www.apache.org/dyn/closer.cgi/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2";>Get the 5.3.0 Source!
+http://www.apache.org/dyn/closer.cgi/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2";>Get the 5.3.1 Source!
 
 http://www.apache.org/dist/cloudstack/KEYS";>KEYS
-http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2.asc";>PGP
-http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2.md5";>MD5
-http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2.sha";>SHA
+http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.asc";>PGP
+http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.md5";>MD5
+http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.sha";>SHA

svn commit: r942326 - in /websites/staging/cloudstack/trunk/content: ./ downloads.html

2015-03-04 Thread buildbot

Author: buildbot
Date: Wed Mar  4 15:57:16 2015
New Revision: 942326

Log:
Staging update by buildbot for cloudstack

Modified:
websites/staging/cloudstack/trunk/content/   (props changed)
websites/staging/cloudstack/trunk/content/downloads.html

Propchange: websites/staging/cloudstack/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar  4 15:57:16 2015
@@ -1 +1 @@
-1664050
+1664058

Modified: websites/staging/cloudstack/trunk/content/downloads.html
==
--- websites/staging/cloudstack/trunk/content/downloads.html (original)
+++ websites/staging/cloudstack/trunk/content/downloads.html Wed Mar  4 
15:57:16 2015
@@ -265,14 +265,14 @@ Additionally, you can verify the MD5 or
 
 Apache CloudStack's CloudMonkey tool is a CLI and shell environment 
designed for interacting with CloudStack-based clouds.
 Source Release
-CloudMonkey's most current release is 5.3.0.
+CloudMonkey's most current release is 5.3.1.
 
-http://www.apache.org/dyn/closer.cgi/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2";>Get the 5.3.0 Source!
+http://www.apache.org/dyn/closer.cgi/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2";>Get the 5.3.1 Source!
 
 http://www.apache.org/dist/cloudstack/KEYS";>KEYS
-http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2.asc";>PGP
-http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2.md5";>MD5
-http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.0/apache-cloudstack-cloudmonkey-5.3.0-src.tar.bz2.sha";>SHA
+http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.asc";>PGP
+http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.md5";>MD5
+http://www.apache.org/dist/cloudstack/releases/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.sha";>SHA

svn commit: r942327 - /websites/production/cloudstack/content/

2015-03-04 Thread bhaisaab

Author: bhaisaab
Date: Wed Mar  4 15:58:01 2015
New Revision: 942327

Log:
CloudMonkey update download page for 5.3.1 release

Added:
websites/production/cloudstack/content/
  - copied from r942326, websites/staging/cloudstack/trunk/content/

Git Push Summary

2015-03-04 Thread bhaisaab

Repository: cloudstack-cloudmonkey
Updated Tags:  refs/tags/5.3.1 [created] 888d600de

cloudstack-cloudmonkey git commit: Makefile: upgrade packages when installing

2015-03-04 Thread bhaisaab

Repository: cloudstack-cloudmonkey
Updated Branches:
  refs/heads/master 7b66d3937 -> 3d02ff3a6


Makefile: upgrade packages when installing

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/3d02ff3a
Tree: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/3d02ff3a
Diff: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/3d02ff3a

Branch: refs/heads/master
Commit: 3d02ff3a6af7793e0b6c89352de68f682455d7e5
Parents: 7b66d39
Author: Rohit Yadav 
Authored: Thu Mar 5 10:35:59 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Mar 5 10:35:59 2015 +0530

--
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/3d02ff3a/Makefile
--
diff --git a/Makefile b/Makefile
index 6356b0c..182cbce 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ buildcache:
 
 install: clean
python setup.py sdist
-   pip install dist/cloudmonkey-*.tar.gz
+   pip install --upgrade dist/cloudmonkey-*.tar.gz
 
 clean:
rm -frv build dist *egg-info

cloudstack-cloudmonkey git commit: requester: unicode string improvements when printing spinner

2015-03-04 Thread bhaisaab

Repository: cloudstack-cloudmonkey
Updated Branches:
  refs/heads/master 3d02ff3a6 -> 523e0bcd2


requester: unicode string improvements when printing spinner

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/523e0bcd
Tree: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/523e0bcd
Diff: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/523e0bcd

Branch: refs/heads/master
Commit: 523e0bcd2a2798b0168d5672d5687c7e3092
Parents: 3d02ff3
Author: Rohit Yadav 
Authored: Thu Mar 5 11:06:37 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Mar 5 11:06:37 2015 +0530

--
 cloudmonkey/requester.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/523e0bcd/cloudmonkey/requester.py
--
diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py
index e9bd452..7266ee7 100644
--- a/cloudmonkey/requester.py
+++ b/cloudmonkey/requester.py
@@ -271,11 +271,11 @@ def monkeyrequest(command, args, isasync, asyncblock, 
logger, url,
 if not timeout:
 timeout = 3600
 timeout = int(timeout)
-cursor = itertools.cycle(['|', '/', '-', '\\'])
+cursor = itertools.cycle([u'|', u'/', u'-', u'\\'])
 while timeout > 0:
 interval = 2
 while interval > 0:
-print '\r' + cursor.next(),
+sys.stdout.write(u"%s\r" % cursor.next())
 sys.stdout.flush()
 time.sleep(0.1)
 interval -= 0.1
@@ -304,7 +304,8 @@ def monkeyrequest(command, args, isasync, asyncblock, 
logger, url,
 jobid, jobresult["errorcode"], jobresult["errortext"])
 return response, error
 elif jobstatus == 1:
-print "\r  "
+sys.stdout.write(u"\r \n")
+sys.stdout.flush()
 return response, error
 elif jobstatus == 0:
 pass  # Job in progress

git commit: updated refs/heads/master to debcbcc

2015-03-04 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/master 83e9a0a80 -> debcbcc14


Fixed PMD NullDeref issues in S3Utils.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/debcbcc1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/debcbcc1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/debcbcc1

Branch: refs/heads/master
Commit: debcbcc1454789936407583fe0aba8e158b16cad
Parents: 83e9a0a
Author: Rajani Karuturi 
Authored: Thu Mar 5 11:58:24 2015 +0530
Committer: Rajani Karuturi 
Committed: Thu Mar 5 11:58:24 2015 +0530

--
 utils/src/com/cloud/utils/S3Utils.java | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/debcbcc1/utils/src/com/cloud/utils/S3Utils.java
--
diff --git a/utils/src/com/cloud/utils/S3Utils.java 
b/utils/src/com/cloud/utils/S3Utils.java
index 6784587..ae7a453 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -339,22 +339,21 @@ public final class S3Utils {
 
 private static List listDirectory(final String 
bucketName, final String directory, final AmazonS3 client) {
 
- List objects = new ArrayList();
- ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
- ObjectListing objectListing;
-
- do {
-  objectListing = client.listObjects(listObjectsRequest);
-  if (objectListing != null )
-objects.addAll(objectListing.getObjectSummaries());
-  listObjectsRequest.setMarker(objectListing.getNextMarker());
- } while (objectListing.isTruncated());
+List objects = new ArrayList();
+ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
+
+ObjectListing ol = client.listObjects(listObjectsRequest);
+while (ol != null && ol.isTruncated()) {
+objects.addAll(ol.getObjectSummaries());
+listObjectsRequest.setMarker(ol.getNextMarker());
+ol = client.listObjects(listObjectsRequest);
+}
+
 if (objects.isEmpty()) {
 return emptyList();
 }
 
 return unmodifiableList(objects);
-
 }
 
 public static void putDirectory(final ClientOptions clientOptions, final 
String bucketName, final File directory, final FilenameFilter fileNameFilter,

git commit: updated refs/heads/4.5 to 04efdce

2015-03-04 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 76674c40d -> 04efdce90


Fixed PMD NullDeref issues in S3Utils.

(cherry picked from commit debcbcc1454789936407583fe0aba8e158b16cad)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04efdce9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04efdce9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04efdce9

Branch: refs/heads/4.5
Commit: 04efdce9014ec60f7df8b77402b7dc39cc263ca4
Parents: 76674c4
Author: Rajani Karuturi 
Authored: Thu Mar 5 11:58:24 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Mar 5 12:49:38 2015 +0530

--
 utils/src/com/cloud/utils/S3Utils.java | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04efdce9/utils/src/com/cloud/utils/S3Utils.java
--
diff --git a/utils/src/com/cloud/utils/S3Utils.java 
b/utils/src/com/cloud/utils/S3Utils.java
index 6784587..ae7a453 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -339,22 +339,21 @@ public final class S3Utils {
 
 private static List listDirectory(final String 
bucketName, final String directory, final AmazonS3 client) {
 
- List objects = new ArrayList();
- ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
- ObjectListing objectListing;
-
- do {
-  objectListing = client.listObjects(listObjectsRequest);
-  if (objectListing != null )
-objects.addAll(objectListing.getObjectSummaries());
-  listObjectsRequest.setMarker(objectListing.getNextMarker());
- } while (objectListing.isTruncated());
+List objects = new ArrayList();
+ListObjectsRequest listObjectsRequest = new 
ListObjectsRequest().withBucketName(bucketName).withPrefix(directory + 
SEPARATOR);
+
+ObjectListing ol = client.listObjects(listObjectsRequest);
+while (ol != null && ol.isTruncated()) {
+objects.addAll(ol.getObjectSummaries());
+listObjectsRequest.setMarker(ol.getNextMarker());
+ol = client.listObjects(listObjectsRequest);
+}
+
 if (objects.isEmpty()) {
 return emptyList();
 }
 
 return unmodifiableList(objects);
-
 }
 
 public static void putDirectory(final ClientOptions clientOptions, final 
String bucketName, final File directory, final FilenameFilter fileNameFilter,

79 matches

Mail list logo