git commit: CLOUDSTACK-1001 hyper V documentation draft in progress

[radhika]

Updated Branches:
  refs/heads/master 623dc98f3 -> 03290c65e


CLOUDSTACK-1001 hyper V documentation draft in progress


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

Branch: refs/heads/master
Commit: 03290c65e17946b9e3ba5e367d334011987a3108
Parents: 623dc98
Author: Radhika PC 
Authored: Thu Jan 16 14:06:06 2014 +0530
Committer: Radhika PC 
Committed: Thu Jan 16 14:06:06 2014 +0530

--
 en-US/hyperv-agent-install.xml   |  48 +++
 en-US/hyperv-checklist.xml   | 113 ++
 en-US/hyperv-host-add.xml|  91 +++
 en-US/hyperv-install-network.xml |  29 +
 en-US/hyperv-install-storage.xml |  42 +
 en-US/hyperv-install.xml |  36 +++
 en-US/hyperv-requirements.xml|  83 +
 en-US/images/add-cifs.png| Bin 0 -> 15692 bytes
 en-US/images/cifs-primary.png| Bin 0 -> 32016 bytes
 en-US/images/cifs-ss.png | Bin 0 -> 33303 bytes
 10 files changed, 442 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/03290c65/en-US/hyperv-agent-install.xml
--
diff --git a/en-US/hyperv-agent-install.xml b/en-US/hyperv-agent-install.xml
new file mode 100644
index 000..5580b90
--- /dev/null
+++ b/en-US/hyperv-agent-install.xml
@@ -0,0 +1,48 @@
+
+http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+
+%BOOK_ENTITIES;
+]>
+
+
+
+  Installing the &PRODUCT; Agent on a Hyper-V Host
+  &PRODUCT; Agent helps &PRODUCT; perform operations on the Hyper-V 
hosts. Therefore, each
+Hyper-V host must have the &PRODUCT; Agent installed on it. &PRODUCT; 
Agent runs as a Windows
+service. This Agent communicates with the Management Server and controls 
all the instances on
+the host. Install the &PRODUCT; Agent on each host using the following 
steps.
+  
+
+  Download the CloudStack Agent for Hyper-V from http://repo-ccp.citrix.com/releases/ASF/hyperv/4.3/CloudPlatform-4.3-01-hypervagent.msi";
+  >CloudStack Hyper-V Agent.
+  You should have a file in the form of
+“CloudPlatform--N-hypervagent.msi”.
+
+
+  Run the installer.
+
+
+  Provide the Hyper-V admin credentials when prompted.
+  When the agent installation is finished, the agent runs as a 
service on the host
+machine.
+
+  
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/03290c65/en-US/hyperv-checklist.xml
--
diff --git a/en-US/hyperv-checklist.xml b/en-US/hyperv-checklist.xml
new file mode 100644
index 000..78545cd
--- /dev/null
+++ b/en-US/hyperv-checklist.xml
@@ -0,0 +1,113 @@
+
+
+%BOOK_ENTITIES;
+]>
+
+
+
+  Preparation Checklist for Hyper-V
+  For a smoother installation, gather the following information before 
you start:
+  
+
+  
+  
+  
+  
+
+  Hyper-V Requirements
+  Value
+  Description
+
+  
+  
+
+  Server Roles
+  Hyper-V
+  After the Windows Server 2012 R2 installation, ensure 
that Hyper-V is selected from Server
+  Roles. For more information, see http://technet.microsoft.com/en-us/library/jj134187.aspx#BKMK_Step2";>Installing
+Hyper-V.
+
+
+  Server Roles
+  File and Storage Services
+  After the Windows Server 2012 R2 installation, ensure 
that File and Storage Services is
+  selected from Server Roles to create an SMB file share. For more 
information, see
+http://technet.microsoft.com/en-us/library/jj134187.aspx#BKMK_Step3";
+>Creating an SMB File Share Using Server 
Manager.
+
+
+  Share Location
+  New folders in the /Share directory
+  The location of the file share for the Hyper-V 
deployment will be the new folder created in
+  the \Shares on the selected volume. You can create sub-folders 
for both &PRODUCT;
+  Primary and Secondary storage within the share location.
+When you select the profile for the file shares, ensure that 
you select SMB Share
+  -Applications. This creates the file shares with settings 
appropriate for
+  Hyper-V.
+
+
+  Preferred DNS Server
+  The IP address of the Active Directory 
domain.
+  While adding an Hyper-V host to the domain, use the 
domain IP as the DNS
+  se

git commit: CLOUDSTACK-1001 hyper V documentation on SMB

[radhika]

Updated Branches:
  refs/heads/master 03290c65e -> 5f20fc5ea


CLOUDSTACK-1001 hyper V documentation on SMB


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

Branch: refs/heads/master
Commit: 5f20fc5ea4d0b4d28ae0751d2612f059c7bc118f
Parents: 03290c6
Author: Radhika PC 
Authored: Thu Jan 16 14:15:24 2014 +0530
Committer: Radhika PC 
Committed: Thu Jan 16 14:15:24 2014 +0530

--
 en-US/about-primary-storage.xml   |  12 +-
 en-US/about-secondary-storage.xml |   1 +
 en-US/primary-storage-add.xml | 349 ++---
 en-US/secondary-storage-add.xml   |  18 +-
 4 files changed, 262 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/5f20fc5e/en-US/about-primary-storage.xml
--
diff --git a/en-US/about-primary-storage.xml b/en-US/about-primary-storage.xml
index 9af9f2d..21f030d 100644
--- a/en-US/about-primary-storage.xml
+++ b/en-US/about-primary-storage.xml
@@ -26,7 +26,17 @@
 About Primary Storage
 Primary storage is associated with a cluster and/or a zone. It 
stores the disk volumes for all of the VMs running on hosts in that cluster. 
You can add multiple primary storage servers to a cluster or a zone (at least 
one is required at the cluster level). Primary storage is typically located 
close to the hosts for increased performance. &PRODUCT; manages the allocation 
of guest virtual disks to particular primary storage devices.
 Primary storage uses the concept of a storage tag. A storage tag is 
a label that is used to identify the primary storage. Each primary storage can 
be associated with zero, one, or more storage tags. When a VM is spun up or a 
data disk attached to a VM for the first time, these tags, if supplied, are 
used to determine which primary storage can support the VM or data disk (ex. 
say you need to guarantee a certain number of IOPS to a particular 
volume).
-Primary storage can be either static or dynamic. Static primary 
storage is what CloudStack has traditionally supported. In this model, the 
administrator must present CloudStack with a certain amount of preallocated 
storage (ex. a volume from a SAN) and CloudStack can place many of its volumes 
on this storage. In the newer, dynamic model, the administrator can present 
CloudStack with a storage system itself (ex. a SAN). CloudStack, working in 
concert with a plug-in developed for that storage system, can dynamically 
create volumes on the storage system. A valuable use for this ability is 
Quality of Service (QoS). If a volume created in CloudStack can be backed by a 
dedicated volume on a SAN (i.e. a one-to-one mapping between a SAN volume and a 
CloudStack volume) and the SAN provides QoS, then CloudStack can provide 
QoS.
+Primary storage can be either static or dynamic. Static primary 
storage is what CloudStack
+has traditionally supported. In this model, the administrator must present 
CloudStack with a
+certain amount of preallocated storage (ex. a volume from a SAN) and 
CloudStack can place many
+of its volumes on this storage. In the newer, dynamic model, the 
administrator can present
+CloudStack with a storage system itself (ex. a SAN). CloudStack, working 
in concert with a
+plug-in developed for that storage system, can dynamically create volumes 
on the storage system.
+A valuable use for this ability is Quality of Service (QoS). If a volume 
created in CloudStack
+can be backed by a dedicated volume on a SAN (i.e. a one-to-one mapping 
between a SAN volume and
+a CloudStack volume) and the SAN provides QoS, then CloudStack can provide 
QoS.
+  For Hyper-V, SMB/CIFS storage is supported. Note that Zone-wide 
Primary Storage is not
+supported in Hyper-V.
 &PRODUCT; is designed to work with all standards-compliant iSCSI and 
NFS servers that are supported by the underlying hypervisor, including, for 
example:
 
 SolidFire for iSCSI

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/5f20fc5e/en-US/about-secondary-storage.xml
--
diff --git a/en-US/about-secondary-storage.xml 
b/en-US/about-secondary-storage.xml
index 2ab262c..31b67bc 100644
--- a/en-US/about-secondary-storage.xml
+++ b/en-US/about-secondary-storage.xml
@@ -44,6 +44,7 @@
 object storage in addition to the zone-based NFS Secondary Staging Store. 
It is not necessary to
 copy templates and snapshots from one zone to another, as would be 
required when using zone NFS
 alone. Everyt

git commit: CLOUDSTACK-1001 hyper V documentation draft in progress

[radhika]

Updated Branches:
  refs/heads/4.3 d4e5dca07 -> c6069b1d0


CLOUDSTACK-1001 hyper V documentation draft in progress


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

Branch: refs/heads/4.3
Commit: c6069b1d0bb0b286236aacb70e316747249b4e7e
Parents: d4e5dca
Author: Radhika PC 
Authored: Thu Jan 16 14:06:06 2014 +0530
Committer: Radhika PC 
Committed: Thu Jan 16 14:24:20 2014 +0530

--
 en-US/hyperv-agent-install.xml   |  48 +++
 en-US/hyperv-checklist.xml   | 113 ++
 en-US/hyperv-host-add.xml|  91 +++
 en-US/hyperv-install-network.xml |  29 +
 en-US/hyperv-install-storage.xml |  42 +
 en-US/hyperv-install.xml |  36 +++
 en-US/hyperv-requirements.xml|  83 +
 en-US/images/add-cifs.png| Bin 0 -> 15692 bytes
 en-US/images/cifs-primary.png| Bin 0 -> 32016 bytes
 en-US/images/cifs-ss.png | Bin 0 -> 33303 bytes
 10 files changed, 442 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/c6069b1d/en-US/hyperv-agent-install.xml
--
diff --git a/en-US/hyperv-agent-install.xml b/en-US/hyperv-agent-install.xml
new file mode 100644
index 000..5580b90
--- /dev/null
+++ b/en-US/hyperv-agent-install.xml
@@ -0,0 +1,48 @@
+
+http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+
+%BOOK_ENTITIES;
+]>
+
+
+
+  Installing the &PRODUCT; Agent on a Hyper-V Host
+  &PRODUCT; Agent helps &PRODUCT; perform operations on the Hyper-V 
hosts. Therefore, each
+Hyper-V host must have the &PRODUCT; Agent installed on it. &PRODUCT; 
Agent runs as a Windows
+service. This Agent communicates with the Management Server and controls 
all the instances on
+the host. Install the &PRODUCT; Agent on each host using the following 
steps.
+  
+
+  Download the CloudStack Agent for Hyper-V from http://repo-ccp.citrix.com/releases/ASF/hyperv/4.3/CloudPlatform-4.3-01-hypervagent.msi";
+  >CloudStack Hyper-V Agent.
+  You should have a file in the form of
+“CloudPlatform--N-hypervagent.msi”.
+
+
+  Run the installer.
+
+
+  Provide the Hyper-V admin credentials when prompted.
+  When the agent installation is finished, the agent runs as a 
service on the host
+machine.
+
+  
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/c6069b1d/en-US/hyperv-checklist.xml
--
diff --git a/en-US/hyperv-checklist.xml b/en-US/hyperv-checklist.xml
new file mode 100644
index 000..78545cd
--- /dev/null
+++ b/en-US/hyperv-checklist.xml
@@ -0,0 +1,113 @@
+
+
+%BOOK_ENTITIES;
+]>
+
+
+
+  Preparation Checklist for Hyper-V
+  For a smoother installation, gather the following information before 
you start:
+  
+
+  
+  
+  
+  
+
+  Hyper-V Requirements
+  Value
+  Description
+
+  
+  
+
+  Server Roles
+  Hyper-V
+  After the Windows Server 2012 R2 installation, ensure 
that Hyper-V is selected from Server
+  Roles. For more information, see http://technet.microsoft.com/en-us/library/jj134187.aspx#BKMK_Step2";>Installing
+Hyper-V.
+
+
+  Server Roles
+  File and Storage Services
+  After the Windows Server 2012 R2 installation, ensure 
that File and Storage Services is
+  selected from Server Roles to create an SMB file share. For more 
information, see
+http://technet.microsoft.com/en-us/library/jj134187.aspx#BKMK_Step3";
+>Creating an SMB File Share Using Server 
Manager.
+
+
+  Share Location
+  New folders in the /Share directory
+  The location of the file share for the Hyper-V 
deployment will be the new folder created in
+  the \Shares on the selected volume. You can create sub-folders 
for both &PRODUCT;
+  Primary and Secondary storage within the share location.
+When you select the profile for the file shares, ensure that 
you select SMB Share
+  -Applications. This creates the file shares with settings 
appropriate for
+  Hyper-V.
+
+
+  Preferred DNS Server
+  The IP address of the Active Directory 
domain.
+  While adding an Hyper-V host to the domain, use the 
domain IP as the DNS
+  server.

git commit: CLOUDSTACK-1001 hyper V documentation on SMB

[radhika]

Updated Branches:
  refs/heads/4.3 c6069b1d0 -> 6b6526b7a


CLOUDSTACK-1001 hyper V documentation on SMB


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

Branch: refs/heads/4.3
Commit: 6b6526b7ad856ff2a4b24578a431bdb956d7fc1a
Parents: c6069b1
Author: Radhika PC 
Authored: Thu Jan 16 14:15:24 2014 +0530
Committer: Radhika PC 
Committed: Thu Jan 16 14:25:14 2014 +0530

--
 en-US/about-primary-storage.xml   |  12 +-
 en-US/about-secondary-storage.xml |   1 +
 en-US/primary-storage-add.xml | 349 ++---
 en-US/secondary-storage-add.xml   |  18 +-
 4 files changed, 262 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6b6526b7/en-US/about-primary-storage.xml
--
diff --git a/en-US/about-primary-storage.xml b/en-US/about-primary-storage.xml
index 9af9f2d..21f030d 100644
--- a/en-US/about-primary-storage.xml
+++ b/en-US/about-primary-storage.xml
@@ -26,7 +26,17 @@
 About Primary Storage
 Primary storage is associated with a cluster and/or a zone. It 
stores the disk volumes for all of the VMs running on hosts in that cluster. 
You can add multiple primary storage servers to a cluster or a zone (at least 
one is required at the cluster level). Primary storage is typically located 
close to the hosts for increased performance. &PRODUCT; manages the allocation 
of guest virtual disks to particular primary storage devices.
 Primary storage uses the concept of a storage tag. A storage tag is 
a label that is used to identify the primary storage. Each primary storage can 
be associated with zero, one, or more storage tags. When a VM is spun up or a 
data disk attached to a VM for the first time, these tags, if supplied, are 
used to determine which primary storage can support the VM or data disk (ex. 
say you need to guarantee a certain number of IOPS to a particular 
volume).
-Primary storage can be either static or dynamic. Static primary 
storage is what CloudStack has traditionally supported. In this model, the 
administrator must present CloudStack with a certain amount of preallocated 
storage (ex. a volume from a SAN) and CloudStack can place many of its volumes 
on this storage. In the newer, dynamic model, the administrator can present 
CloudStack with a storage system itself (ex. a SAN). CloudStack, working in 
concert with a plug-in developed for that storage system, can dynamically 
create volumes on the storage system. A valuable use for this ability is 
Quality of Service (QoS). If a volume created in CloudStack can be backed by a 
dedicated volume on a SAN (i.e. a one-to-one mapping between a SAN volume and a 
CloudStack volume) and the SAN provides QoS, then CloudStack can provide 
QoS.
+Primary storage can be either static or dynamic. Static primary 
storage is what CloudStack
+has traditionally supported. In this model, the administrator must present 
CloudStack with a
+certain amount of preallocated storage (ex. a volume from a SAN) and 
CloudStack can place many
+of its volumes on this storage. In the newer, dynamic model, the 
administrator can present
+CloudStack with a storage system itself (ex. a SAN). CloudStack, working 
in concert with a
+plug-in developed for that storage system, can dynamically create volumes 
on the storage system.
+A valuable use for this ability is Quality of Service (QoS). If a volume 
created in CloudStack
+can be backed by a dedicated volume on a SAN (i.e. a one-to-one mapping 
between a SAN volume and
+a CloudStack volume) and the SAN provides QoS, then CloudStack can provide 
QoS.
+  For Hyper-V, SMB/CIFS storage is supported. Note that Zone-wide 
Primary Storage is not
+supported in Hyper-V.
 &PRODUCT; is designed to work with all standards-compliant iSCSI and 
NFS servers that are supported by the underlying hypervisor, including, for 
example:
 
 SolidFire for iSCSI

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6b6526b7/en-US/about-secondary-storage.xml
--
diff --git a/en-US/about-secondary-storage.xml 
b/en-US/about-secondary-storage.xml
index 2ab262c..31b67bc 100644
--- a/en-US/about-secondary-storage.xml
+++ b/en-US/about-secondary-storage.xml
@@ -44,6 +44,7 @@
 object storage in addition to the zone-based NFS Secondary Staging Store. 
It is not necessary to
 copy templates and snapshots from one zone to another, as would be 
required when using zone NFS
 alone. Everything i

git commit: updated refs/heads/4.3 to ab0a068

[devdeep]

Updated Branches:
  refs/heads/4.3 9ed4ab731 -> ab0a068d9


CLOUDSTACK-5880: Communication between management server and hyper-v agent 
should be secure.


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

Branch: refs/heads/4.3
Commit: ab0a068d9f8f5601b804661929b1f4245ea5cf4e
Parents: 9ed4ab7
Author: Anshul Gangwar 
Authored: Fri Jan 10 17:18:35 2014 +0530
Committer: Devdeep Singh 
Committed: Thu Jan 16 14:42:24 2014 +0530

--
 .../ServerResource/AgentShell/AgentService.cs   |  2 +-
 .../resource/HypervDirectConnectResource.java   | 48 ++--
 2 files changed, 44 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab0a068d/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
index e187097..9d66a5c 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
@@ -47,7 +47,7 @@ namespace CloudStack.Plugin.AgentShell
 logger.Info("Starting CloudStack agent");
 InitializeComponent();
 
-UriBuilder baseUri = new UriBuilder("http", 
AgentSettings.Default.private_ip_address, AgentSettings.Default.port);
+UriBuilder baseUri = new UriBuilder("https", 
AgentSettings.Default.private_ip_address, AgentSettings.Default.port);
 
 var config = new HttpSelfHostConfiguration(baseUri.Uri);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab0a068d/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
--
diff --git 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index bb78fce..1edfea3 100644
--- 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -25,6 +25,12 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.channels.SocketChannel;
 import java.rmi.RemoteException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,11 +46,20 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.conn.BasicClientConnectionManager;
 import org.apache.http.util.EntityUtils;
 import org.apache.log4j.Logger;
 
+import com.google.gson.Gson;
+
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.CheckRouterAnswer;
 import com.cloud.agent.api.CheckRouterCommand;
@@ -115,7 +130,6 @@ import com.cloud.utils.net.NetUtils;
 import com.cloud.utils.ssh.SshHelper;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineName;
-import com.google.gson.Gson;
 
 /**
  * Implementation of dummy resource to be returned from discoverer.
@@ -131,7 +145,7 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 private String _clusterId;
 private String _guid;
 private String _agentIp;
-private int _port = DEFAULT_AGENT_PORT;
+private final int _port = DEFAULT_AGENT_PORT;
 protected final long _ops_timeout = 90;  // 15 minutes time out to time
 
 protected final int _retry = 24;
@@ -340,7 +354,7 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 try {
 String cmdName =

git commit: updated refs/heads/master to 823abe6

[devdeep]

Updated Branches:
  refs/heads/master fcd21eb7f -> 823abe6a2


CLOUDSTACK-5880: Communication between management server and hyper-v agent 
should be secure.


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

Branch: refs/heads/master
Commit: 823abe6a2389371116c189069bb26ed41f62f467
Parents: fcd21eb
Author: Anshul Gangwar 
Authored: Fri Jan 10 17:18:35 2014 +0530
Committer: Devdeep Singh 
Committed: Thu Jan 16 14:48:28 2014 +0530

--
 .../ServerResource/AgentShell/AgentService.cs   |  2 +-
 .../resource/HypervDirectConnectResource.java   | 47 ++--
 2 files changed, 45 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/823abe6a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
index e187097..9d66a5c 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.cs
@@ -47,7 +47,7 @@ namespace CloudStack.Plugin.AgentShell
 logger.Info("Starting CloudStack agent");
 InitializeComponent();
 
-UriBuilder baseUri = new UriBuilder("http", 
AgentSettings.Default.private_ip_address, AgentSettings.Default.port);
+UriBuilder baseUri = new UriBuilder("https", 
AgentSettings.Default.private_ip_address, AgentSettings.Default.port);
 
 var config = new HttpSelfHostConfiguration(baseUri.Uri);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/823abe6a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
--
diff --git 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index 72a5921..519f457 100644
--- 
a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ 
b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -25,6 +25,12 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.channels.SocketChannel;
 import java.rmi.RemoteException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,8 +46,15 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.conn.BasicClientConnectionManager;
 import org.apache.http.util.EntityUtils;
 import org.apache.log4j.Logger;
 
@@ -302,7 +315,9 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 URI agentUri = null;
 try {
 String cmdName = StartupCommand.class.getName();
-agentUri = new URI("http", null, _agentIp, _port, 
"/api/HypervResource/" + cmdName, null, null);
+agentUri =
+new URI("https", null, _agentIp, _port,
+"/api/HypervResource/" + cmdName, null, null);
 } catch (URISyntaxException e) {
 // TODO add proper logging
 String errMsg = "Could not generate URI for Hyper-V agent";
@@ -339,7 +354,9 @@ public class HypervDirectConnectResource extends 
ServerResourceBase implements S
 Answer answer = null;
 try {
 String cmdName = cmd.getClass().getName();
-agentUri = new URI("http", null, _agentIp, _port, 
"/api/HypervResource/" + cmdName, null, null);
+agentUri =
+

Build failed in Jenkins: cloudstack-rat-master #3842

[Apache Jenkins Server]

See 

Changes:

[devdeep] CLOUDSTACK-5880: Communication between management server and hyper-v 
agent should be secure.

--
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision 823abe6a2389371116c189069bb26ed41f62f467 (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson1920435779691570038.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: systemvm/conf/agent

git commit: agent name updated

[radhika]

Updated Branches:
  refs/heads/4.3 6b6526b7a -> 6c2b166b4


agent name updated


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

Branch: refs/heads/4.3
Commit: 6c2b166b4f81082e358eebc07a12d5c3c3a41be8
Parents: 6b6526b
Author: Radhika PC 
Authored: Thu Jan 16 15:41:42 2014 +0530
Committer: Radhika PC 
Committed: Thu Jan 16 15:41:42 2014 +0530

--
 en-US/hyperv-agent-install.xml | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6c2b166b/en-US/hyperv-agent-install.xml
--
diff --git a/en-US/hyperv-agent-install.xml b/en-US/hyperv-agent-install.xml
index 5580b90..22b17d6 100644
--- a/en-US/hyperv-agent-install.xml
+++ b/en-US/hyperv-agent-install.xml
@@ -29,12 +29,9 @@
 the host. Install the &PRODUCT; Agent on each host using the following 
steps.
   
 
-  Download the CloudStack Agent for Hyper-V from http://repo-ccp.citrix.com/releases/ASF/hyperv/4.3/CloudPlatform-4.3-01-hypervagent.msi";
-  >CloudStack Hyper-V Agent.
-  You should have a file in the form of
-“CloudPlatform--N-hypervagent.msi”.
+  Build the CloudStack Agent for Hyper-V as given in https://cwiki.apache.org/confluence/display/CLOUDSTACK/Creating+Hyperv+Agent+Installer";
+  >Building CloudStack Hyper-V Agent.
 
 
   Run the installer.

git commit: agent name updated

[radhika]

Updated Branches:
  refs/heads/master 5f20fc5ea -> fddbcd004


agent name updated


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

Branch: refs/heads/master
Commit: fddbcd00422b7c6b6a9169752d9089594b0dd1c0
Parents: 5f20fc5
Author: Radhika PC 
Authored: Thu Jan 16 15:41:42 2014 +0530
Committer: Radhika PC 
Committed: Thu Jan 16 15:42:55 2014 +0530

--
 en-US/hyperv-agent-install.xml | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/fddbcd00/en-US/hyperv-agent-install.xml
--
diff --git a/en-US/hyperv-agent-install.xml b/en-US/hyperv-agent-install.xml
index 5580b90..22b17d6 100644
--- a/en-US/hyperv-agent-install.xml
+++ b/en-US/hyperv-agent-install.xml
@@ -29,12 +29,9 @@
 the host. Install the &PRODUCT; Agent on each host using the following 
steps.
   
 
-  Download the CloudStack Agent for Hyper-V from http://repo-ccp.citrix.com/releases/ASF/hyperv/4.3/CloudPlatform-4.3-01-hypervagent.msi";
-  >CloudStack Hyper-V Agent.
-  You should have a file in the form of
-“CloudPlatform--N-hypervagent.msi”.
+  Build the CloudStack Agent for Hyper-V as given in https://cwiki.apache.org/confluence/display/CLOUDSTACK/Creating+Hyperv+Agent+Installer";
+  >Building CloudStack Hyper-V Agent.
 
 
   Run the installer.

git commit: updated refs/heads/4.3 to e49a60c

[hugo]

Updated Branches:
  refs/heads/4.3 ab0a068d9 -> e49a60c54


CLOUDSTACK-5883 Improve error handling to get the real error


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

Branch: refs/heads/4.3
Commit: e49a60c544bd877a1e206b305bb00984f0795738
Parents: ab0a068
Author: Hugo Trippaers 
Authored: Thu Jan 16 12:31:14 2014 +0100
Committer: Hugo Trippaers 
Committed: Thu Jan 16 12:31:14 2014 +0100

--
 .../hypervisor/vmware/mo/HypervisorHostHelper.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e49a60c5/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
--
diff --git 
a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java 
b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index cd2c3e8..3ba27d0 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -44,6 +44,7 @@ import com.vmware.vim25.HostVirtualSwitch;
 import com.vmware.vim25.HttpNfcLeaseDeviceUrl;
 import com.vmware.vim25.HttpNfcLeaseInfo;
 import com.vmware.vim25.HttpNfcLeaseState;
+import com.vmware.vim25.LocalizedMethodFault;
 import com.vmware.vim25.LongPolicy;
 import com.vmware.vim25.ManagedObjectReference;
 import com.vmware.vim25.ObjectContent;
@@ -66,6 +67,7 @@ import 
com.vmware.vim25.VmwareDistributedVirtualSwitchPvlanSpec;
 import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanIdSpec;
 import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanSpec;
 
+import com.cloud.exception.CloudException;
 import com.cloud.hypervisor.vmware.util.VmwareContext;
 import com.cloud.hypervisor.vmware.util.VmwareHelper;
 import com.cloud.network.Networks.BroadcastDomainType;
@@ -1332,6 +1334,19 @@ public class HypervisorHostHelper {
 throw new Exception(msg);
 }
 
+if(!ovfImportResult.getError().isEmpty()) {
+for (LocalizedMethodFault fault : ovfImportResult.getError()) {
+s_logger.error("createImportSpec error: " + 
fault.getLocalizedMessage());
+}
+throw new CloudException("Failed to create an import spec from " + 
ovfFilePath + ". Check log for details.");
+}
+
+if (!ovfImportResult.getWarning().isEmpty()) {
+for (LocalizedMethodFault fault : ovfImportResult.getError()) {
+s_logger.warn("createImportSpec warning: " + 
fault.getLocalizedMessage());
+}
+}
+
 DatacenterMO dcMo = new DatacenterMO(context, 
host.getHyperHostDatacenter());
 ManagedObjectReference morLease = 
context.getService().importVApp(morRp,
 ovfImportResult.getImportSpec(), dcMo.getVmFolder(), morHost);

[1/2] git commit: updated refs/heads/master to 794d47c

[hugo]

Updated Branches:
  refs/heads/master 823abe6a2 -> 794d47c5f


CLOUDSTACK-5883 Improve error handling to get the real error


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

Branch: refs/heads/master
Commit: 98e529af41fa0a1f8ced6c674848e2130fbb0eb6
Parents: 823abe6
Author: Hugo Trippaers 
Authored: Thu Jan 16 12:31:14 2014 +0100
Committer: Hugo Trippaers 
Committed: Thu Jan 16 14:43:33 2014 +0100

--
 .../hypervisor/vmware/mo/HypervisorHostHelper.java| 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98e529af/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
--
diff --git 
a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java 
b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index 9f5d4f9..2ddc144 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -68,6 +68,7 @@ import 
com.vmware.vim25.VmwareDistributedVirtualSwitchPvlanSpec;
 import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanIdSpec;
 import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanSpec;
 
+import com.cloud.exception.CloudException;
 import com.cloud.hypervisor.vmware.util.VmwareContext;
 import com.cloud.hypervisor.vmware.util.VmwareHelper;
 import com.cloud.network.Networks.BroadcastDomainType;
@@ -1296,6 +1297,19 @@ public class HypervisorHostHelper {
 throw new Exception(msg);
 }
 
+if(!ovfImportResult.getError().isEmpty()) {
+for (LocalizedMethodFault fault : ovfImportResult.getError()) {
+s_logger.error("createImportSpec error: " + 
fault.getLocalizedMessage());
+}
+throw new CloudException("Failed to create an import spec from " + 
ovfFilePath + ". Check log for details.");
+}
+
+if (!ovfImportResult.getWarning().isEmpty()) {
+for (LocalizedMethodFault fault : ovfImportResult.getError()) {
+s_logger.warn("createImportSpec warning: " + 
fault.getLocalizedMessage());
+}
+}
+
 DatacenterMO dcMo = new DatacenterMO(context, 
host.getHyperHostDatacenter());
 ManagedObjectReference morLease = 
context.getService().importVApp(morRp, ovfImportResult.getImportSpec(), 
dcMo.getVmFolder(), morHost);
 if (morLease == null) {

[2/2] git commit: updated refs/heads/master to 794d47c

[hugo]

CLOUDSTACK-5883 Convert ovf file to proper format for ESXi


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

Branch: refs/heads/master
Commit: 794d47c5f279bc8cbd212d9dd87673b8302de9db
Parents: 98e529a
Author: Hugo Trippaers 
Authored: Thu Jan 16 14:42:34 2014 +0100
Committer: Hugo Trippaers 
Committed: Thu Jan 16 14:43:44 2014 +0100

--
 tools/appliance/build.sh |  6 +-
 tools/appliance/convert_ovf_vbox_to_esx.xslt | 24 +++
 2 files changed, 29 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/794d47c5/tools/appliance/build.sh
--
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 61ee793..9a201f9 100644
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -92,7 +92,11 @@ echo "$appliance exported for KVM: 
dist/$appliance-$build_date-$branch-kvm.qcow2
 vboxmanage clonehd $hdd_uuid $appliance-$build_date-$branch-vmware.vmdk 
--format VMDK
 bzip2 $appliance-$build_date-$branch-vmware.vmdk
 echo "$appliance exported for VMWare: 
dist/$appliance-$build_date-$branch-vmware.vmdk.bz2"
-vboxmanage export $machine_uuid --output 
$appliance-$build_date-$branch-vmware.ova
+vboxmanage export $machine_uuid --output 
$appliance-$build_date-$branch-vmware.ovf
+mv $appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware.ovf-orig
+xsltproc convert_ovf_vbox_to_esx.xslt 
$appliance-$build_date-$branch-vmware.ovf-orig > 
$appliance-$build_date-$branch-vmware.ovf
+tar -cf $appliance-$build_date-$branch-vmware.ova 
$appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware-disk1.vmdk
+rm -f $appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware.ovf-orig 
$appliance-$build_date-$branch-vmware-disk1.vmdk
 echo "$appliance exported for VMWare: 
dist/$appliance-$build_date-$branch-vmware.ova"
 
 # Export for HyperV

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/794d47c5/tools/appliance/convert_ovf_vbox_to_esx.xslt
--
diff --git a/tools/appliance/convert_ovf_vbox_to_esx.xslt 
b/tools/appliance/convert_ovf_vbox_to_esx.xslt
new file mode 100644
index 000..2aa1c7e
--- /dev/null
+++ b/tools/appliance/convert_ovf_vbox_to_esx.xslt
@@ -0,0 +1,24 @@
+
+http://www.w3.org/1999/XSL/Transform"; 
xmlns:ovf="http://www.vmware.com/schema/ovf/1/envelope"; 
xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData";
 
xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:vbox="http://www.virtualbox.org/ovf/machine";>
+
+
+
+
+
+
+
+vmx-06
+  
+
+
+
+
+scsiController0
+SCSI Controller
+
+lsilogic
+6
+
+
+
+

Build failed in Jenkins: cloudstack-rat-master #3843

[Apache Jenkins Server]

See 

Changes:

[htrippaers] CLOUDSTACK-5883 Improve error handling to get the real error

[htrippaers] CLOUDSTACK-5883 Convert ovf file to proper format for ESXi

--
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision 794d47c5f279bc8cbd212d9dd87673b8302de9db (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson3947340955142740991.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/req

git commit: updated refs/heads/master to bf26efc

[hugo]

Updated Branches:
  refs/heads/master 794d47c5f -> bf26efc55


Little hack until we can install xsltproc on the buildslave


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

Branch: refs/heads/master
Commit: bf26efc551e56d21a24049952ebe81f9686df5ec
Parents: 794d47c
Author: Hugo Trippaers 
Authored: Thu Jan 16 15:33:05 2014 +0100
Committer: Hugo Trippaers 
Committed: Thu Jan 16 15:33:05 2014 +0100

--
 tools/appliance/build.sh  |   2 +-
 tools/appliance/convert/Convert.class | Bin 0 -> 984 bytes
 tools/appliance/convert/Convert.java  |  34 +
 3 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf26efc5/tools/appliance/build.sh
--
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 9a201f9..e52208c 100644
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -94,7 +94,7 @@ bzip2 $appliance-$build_date-$branch-vmware.vmdk
 echo "$appliance exported for VMWare: 
dist/$appliance-$build_date-$branch-vmware.vmdk.bz2"
 vboxmanage export $machine_uuid --output 
$appliance-$build_date-$branch-vmware.ovf
 mv $appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware.ovf-orig
-xsltproc convert_ovf_vbox_to_esx.xslt 
$appliance-$build_date-$branch-vmware.ovf-orig > 
$appliance-$build_date-$branch-vmware.ovf
+java -cp convert convert_ovf_vbox_to_esx.xslt 
$appliance-$build_date-$branch-vmware.ovf-orig 
$appliance-$build_date-$branch-vmware.ovf
 tar -cf $appliance-$build_date-$branch-vmware.ova 
$appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware-disk1.vmdk
 rm -f $appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware.ovf-orig 
$appliance-$build_date-$branch-vmware-disk1.vmdk
 echo "$appliance exported for VMWare: 
dist/$appliance-$build_date-$branch-vmware.ova"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf26efc5/tools/appliance/convert/Convert.class
--
diff --git a/tools/appliance/convert/Convert.class 
b/tools/appliance/convert/Convert.class
new file mode 100644
index 000..fca4dd3
Binary files /dev/null and b/tools/appliance/convert/Convert.class differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf26efc5/tools/appliance/convert/Convert.java
--
diff --git a/tools/appliance/convert/Convert.java 
b/tools/appliance/convert/Convert.java
new file mode 100644
index 000..e29fdb2
--- /dev/null
+++ b/tools/appliance/convert/Convert.java
@@ -0,0 +1,34 @@
+// 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.
+
+import javax.xml.transform.*;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+public class Convert {
+public static void main(String[] args) throws IOException, 
URISyntaxException, TransformerException {
+TransformerFactory factory = TransformerFactory.newInstance();
+Source xslt = new StreamSource(new File(args[0]));
+Transformer transformer = factory.newTransformer(xslt);
+
+Source text = new StreamSource(new File(args[1]));
+transformer.transform(text, new StreamResult(new File(args[2])));
+}
+}

Build failed in Jenkins: cloudstack-rat-master #3844

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Little hack until we can install xsltproc on the buildslave

--
Started by an SCM change
Building remotely on ubuntu1 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision bf26efc551e56d21a24049952ebe81f9686df5ec (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson2713037784261900791.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: sys

git commit: updated refs/heads/master to 5d24843

[hugo]

Updated Branches:
  refs/heads/master bf26efc55 -> 5d24843ef


Proper cleanup before the next build of the systemvm


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

Branch: refs/heads/master
Commit: 5d24843ef59b4d28a9a81ade4510c44b2a048b06
Parents: bf26efc
Author: Hugo Trippaers 
Authored: Thu Jan 16 16:03:56 2014 +0100
Committer: Hugo Trippaers 
Committed: Thu Jan 16 16:03:56 2014 +0100

--
 tools/appliance/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d24843e/tools/appliance/build.sh
--
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index e52208c..a35aa64 100644
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -60,7 +60,7 @@ done
 vboxmanage modifyhd $hdd_uuid --compact
 
 # Start exporting
-rm -fr dist *.ova *.vhd *.vdi *.qcow* *.bz2
+rm -fr dist *.ova *.vhd *.vdi *.qcow* *.bz2 *.vmdk *.ovf
 mkdir dist
 
 # Export for Xen

Build failed in Jenkins: cloudstack-rat-master #3845

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Proper cleanup before the next build of the systemvm

--
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision 5d24843ef59b4d28a9a81ade4510c44b2a048b06 (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson3033643720988899469.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: systemvm/c

Build failed in Jenkins: cloudstack-rat-master #3846

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Fix typo in convert call

--
Started by an SCM change
Building remotely on ubuntu1 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision 95a92ad2e3e7a8ceade4e5cd2e4ebd717c1cc2ab (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson1633968519135150837.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: systemvm/conf/environment.properties
[

git commit: updated refs/heads/master to 95a92ad

[hugo]

Updated Branches:
  refs/heads/master 5d24843ef -> 95a92ad2e


Fix typo in convert call


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

Branch: refs/heads/master
Commit: 95a92ad2e3e7a8ceade4e5cd2e4ebd717c1cc2ab
Parents: 5d24843
Author: Hugo Trippaers 
Authored: Thu Jan 16 16:41:46 2014 +0100
Committer: Hugo Trippaers 
Committed: Thu Jan 16 16:41:46 2014 +0100

--
 tools/appliance/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95a92ad2/tools/appliance/build.sh
--
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index a35aa64..ddcaec9 100644
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -94,7 +94,7 @@ bzip2 $appliance-$build_date-$branch-vmware.vmdk
 echo "$appliance exported for VMWare: 
dist/$appliance-$build_date-$branch-vmware.vmdk.bz2"
 vboxmanage export $machine_uuid --output 
$appliance-$build_date-$branch-vmware.ovf
 mv $appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware.ovf-orig
-java -cp convert convert_ovf_vbox_to_esx.xslt 
$appliance-$build_date-$branch-vmware.ovf-orig 
$appliance-$build_date-$branch-vmware.ovf
+java -cp convert Convert convert_ovf_vbox_to_esx.xslt 
$appliance-$build_date-$branch-vmware.ovf-orig 
$appliance-$build_date-$branch-vmware.ovf
 tar -cf $appliance-$build_date-$branch-vmware.ova 
$appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware-disk1.vmdk
 rm -f $appliance-$build_date-$branch-vmware.ovf 
$appliance-$build_date-$branch-vmware.ovf-orig 
$appliance-$build_date-$branch-vmware-disk1.vmdk
 echo "$appliance exported for VMWare: 
dist/$appliance-$build_date-$branch-vmware.ova"

git commit: updated refs/heads/master to da8ee45

[hugo]

Updated Branches:
  refs/heads/master 95a92ad2e -> da8ee45a2


Why is the easy solution always to hard


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

Branch: refs/heads/master
Commit: da8ee45a249f89f2ef2a74d225854b37785f6922
Parents: 95a92ad
Author: Hugo Trippaers 
Authored: Thu Jan 16 17:27:13 2014 +0100
Committer: Hugo Trippaers 
Committed: Thu Jan 16 17:27:13 2014 +0100

--
 tools/appliance/convert/Convert.class| Bin 984 -> 984 bytes
 tools/appliance/convert_ovf_vbox_to_esx.xslt |  18 ++
 2 files changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da8ee45a/tools/appliance/convert/Convert.class
--
diff --git a/tools/appliance/convert/Convert.class 
b/tools/appliance/convert/Convert.class
index fca4dd3..3f24341 100644
Binary files a/tools/appliance/convert/Convert.class and 
b/tools/appliance/convert/Convert.class differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da8ee45a/tools/appliance/convert_ovf_vbox_to_esx.xslt
--
diff --git a/tools/appliance/convert_ovf_vbox_to_esx.xslt 
b/tools/appliance/convert_ovf_vbox_to_esx.xslt
index 2aa1c7e..b07454d 100644
--- a/tools/appliance/convert_ovf_vbox_to_esx.xslt
+++ b/tools/appliance/convert_ovf_vbox_to_esx.xslt
@@ -1,4 +1,22 @@
 
+
 http://www.w3.org/1999/XSL/Transform"; 
xmlns:ovf="http://www.vmware.com/schema/ovf/1/envelope"; 
xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData";
 
xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:vbox="http://www.virtualbox.org/ovf/machine";>
 
 

Build failed in Jenkins: cloudstack-rat-master #3847

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Why is the easy solution always to hard

--
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision da8ee45a249f89f2ef2a74d225854b37785f6922 (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson6439689165744463455.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: systemvm/conf/environme

git commit: updated refs/heads/4.3 to 151c239

[sateesh]

Updated Branches:
  refs/heads/4.3 e49a60c54 -> 151c23981


CLOUDSTACK-5868 Default templates are still referring to older templates in DB

Updated URL and bits for 64-bit system vm template for VMware.

Signed-off-by: Sateesh Chodapuneedi 


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

Branch: refs/heads/4.3
Commit: 151c2398129f0e8dedb10622061a5736b8abcd24
Parents: e49a60c
Author: Sateesh Chodapuneedi 
Authored: Thu Jan 16 18:16:35 2014 +0530
Committer: Sateesh Chodapuneedi 
Committed: Thu Jan 16 18:16:35 2014 +0530

--
 setup/db/templates.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/151c2398/setup/db/templates.sql
--
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 84d1fd4..a5dc8b1 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -34,7 +34,7 @@ INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, 
name, public, created,
 VALUES (7, UUID(), 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 
1, now(), 'BUILTIN', 0, 64, 1, 
'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 
'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 
'OVA', 12, 1, 1, 'VMware', 1);
 
 INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, 
created, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
-VALUES (8, UUID(), 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 
'SYSTEM', 0, 32, 1, 
'http://download.cloud.com/templates/4.2/systemvmtemplate-4.2-vh7.ova', 
'8fde62b1089e5844a9cd3b9b953f9596', 0, 'SystemVM Template (vSphere)', 'OVA', 
15, 0, 1, 'VMware' );
+VALUES (8, UUID(), 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova',
 'ef593a061f3b7594ab0bfd9b0ed0a0d4', 0, 'SystemVM Template (vSphere)', 'OVA', 
15, 0, 1, 'VMware' );
 
 INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, 
created, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
 VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2',
 '5df45ee6ebe1b703a8805f4e1f4d0818', 0, 'SystemVM Template (HyperV)', 'VHD', 
15, 0, 1, 'Hyperv' );

git commit: updated refs/heads/master to aa6dddc

[alena1108]

Updated Branches:
  refs/heads/master da8ee45a2 -> aa6dddc77


CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs 
to ROOT admin


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

Branch: refs/heads/master
Commit: aa6dddc778ae693d57affa90404d1b75f2a0b1f0
Parents: da8ee45
Author: Alena Prokharchyk 
Authored: Thu Jan 16 10:58:40 2014 -0800
Committer: Alena Prokharchyk 
Committed: Thu Jan 16 10:59:38 2014 -0800

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 22 +++--
 1 file changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa6dddc7/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index e94..5a4cea4 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -965,10 +965,15 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if (network == null) {
 throw new InvalidParameterValueException("unable to find a network 
with id " + networkId);
 }
-if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
-&& !(network.getAclType() == ACLType.Account && 
network.getAccountId() == vmInstance.getAccountId())) {
-throw new InvalidParameterValueException("only shared network or 
isolated network with the same account_id can be added to vmId: " + vmId);
+
+Account vmOwner = _accountMgr.getAccount(vmInstance.getAccountId());
+if (vmOwner.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
+&& !(network.getAclType() == ACLType.Account && 
network.getAccountId() == vmInstance.getAccountId())) {
+throw new InvalidParameterValueException("only shared network 
or isolated network with the same account_id can be added to vmId: " + vmId);
+}
 }
+
 List allNics = _nicDao.listByVmId(vmInstance.getId());
 for (NicVO nic : allNics) {
 if (nic.getNetworkId() == network.getId())
@@ -2632,10 +2637,15 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if (network.getDataCenterId() != zone.getId()) {
 throw new InvalidParameterValueException("Network id=" + 
network.getId() + " doesn't belong to zone " + zone.getId());
 }
-if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
-&& !(network.getAclType() == ACLType.Account && 
network.getAccountId() == accountId)) {
-throw new InvalidParameterValueException("only shared network 
or isolated network with the same account_id can be added to vm");
+
+Account vmOwner = _accountMgr.getAccount(accountId);
+if (vmOwner.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
+&& !(network.getAclType() == ACLType.Account && 
network.getAccountId() == accountId)) {
+throw new InvalidParameterValueException("only shared 
network or isolated network with the same account_id can be added to vm");
+}
 }
+
 IpAddresses requestedIpPair = null;
 if (requestedIps != null && !requestedIps.isEmpty()) {
 requestedIpPair = requestedIps.get(network.getId());

git commit: updated refs/heads/4.3 to c375ec6

[alena1108]

Updated Branches:
  refs/heads/4.3 e2364cfca -> c375ec62e


CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs 
to ROOT admin


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

Branch: refs/heads/4.3
Commit: c375ec62e2bc48b17b4ebac5479c295ec89a5f9a
Parents: e2364cf
Author: Alena Prokharchyk 
Authored: Thu Jan 16 10:58:40 2014 -0800
Committer: Alena Prokharchyk 
Committed: Thu Jan 16 11:12:35 2014 -0800

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 31 +
 1 file changed, 20 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c375ec62/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 792cf77..a3dbcb7 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -34,10 +34,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.capacity.Capacity;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -83,6 +79,8 @@ import 
org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.TemplateObjectTO;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
@@ -102,6 +100,7 @@ import com.cloud.alert.AlertManager;
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.query.dao.UserVmJoinDao;
 import com.cloud.api.query.vo.UserVmJoinVO;
+import com.cloud.capacity.Capacity;
 import com.cloud.capacity.CapacityManager;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;
@@ -125,6 +124,7 @@ import com.cloud.domain.dao.DomainDao;
 import com.cloud.event.ActionEvent;
 import com.cloud.event.EventTypes;
 import com.cloud.event.UsageEventUtils;
+import com.cloud.event.UsageEventVO;
 import com.cloud.event.dao.UsageEventDao;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.CloudException;
@@ -269,7 +269,6 @@ import com.cloud.vm.snapshot.VMSnapshot;
 import com.cloud.vm.snapshot.VMSnapshotManager;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
-import com.cloud.event.UsageEventVO;
 
 @Local(value = { UserVmManager.class, UserVmService.class })
 public class UserVmManagerImpl extends ManagerBase implements UserVmManager, 
VirtualMachineGuru, UserVmService, Configurable {
@@ -987,10 +986,15 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if(network == null) {
 throw new InvalidParameterValueException("unable to find a network 
with id " + networkId);
 }
-if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
-&& !(network.getAclType() == ACLType.Account && 
network.getAccountId() == vmInstance.getAccountId())) {
-throw new InvalidParameterValueException("only shared network or 
isolated network with the same account_id can be added to vmId: " + vmId);
+
+Account vmOwner = _accountMgr.getAccount(vmInstance.getAccountId());
+if (vmOwner.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
+&& !(network.getAclType() == ACLType.Account && 
network.getAccountId() == vmInstance.getAccountId())) {
+throw new InvalidParameterValueException("only shared network 
or isolated network with the same account_id can be added to vmId: " + vmId);
+}
 }
+
 List allNics = _nicDao.listByVmId(vmInstance.getId());
 for(NicVO nic : allNics){
 if(nic.getNetworkId() == network.getId())
@@ -2794,10 +2798,15 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 + network.getId() + " doesn't belong to zone "
 + zone.getId());
 }
-if (!(network.getG

git commit: updated refs/heads/4.3 to e2364cf

[mtutkowski]

Updated Branches:
  refs/heads/4.3 151c23981 -> e2364cfca


CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is 
created with option startvm=false


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

Branch: refs/heads/4.3
Commit: e2364cfca6aa9f4c33d98fa8d2b2461d996b1ddd
Parents: 151c239
Author: Mike Tutkowski 
Authored: Wed Jan 15 14:33:15 2014 -0700
Committer: Mike Tutkowski 
Committed: Thu Jan 16 12:08:05 2014 -0700

--
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  8 ++-
 .../orchestration/VolumeOrchestrator.java   | 19 ++
 .../xen/resource/CitrixResourceBase.java| 63 +++-
 .../xen/resource/XenServerStorageProcessor.java | 16 +
 4 files changed, 86 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2364cfc/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index af65ac6..e90ff1f 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1123,15 +1123,17 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 Map details = disk.getDetails();
 boolean isManaged = details != null && 
Boolean.parseBoolean(details.get(DiskTO.MANAGED));
 
-if (isManaged && disk.getPath() == null) {
+if (isManaged) {
 Long volumeId = disk.getData().getId();
 VolumeVO volume = _volsDao.findById(volumeId);
 String iScsiName = volume.get_iScsiName();
 String path = iqnToPath.get(iScsiName);
 
-volume.setPath(path);
+if (path != null) {
+volume.setPath(path);
 
-_volsDao.update(volumeId, volume);
+_volsDao.update(volumeId, volume);
+}
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2364cfc/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
--
diff --git 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 268b317..edc5985 100644
--- 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -438,6 +438,7 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 @DB
 public VolumeInfo createVolume(VolumeInfo volume, VirtualMachine vm, 
VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId, 
ServiceOffering offering,
 DiskOffering diskOffering, List avoids, long size, 
HypervisorType hyperType) {
+// update the volume's hypervisor_ss_reserve from its disk offering 
(used for managed storage)
 volume = updateHypervisorSnapshotReserveForVolume(diskOffering, 
volume, hyperType);
 
 StoragePool pool = null;
@@ -1156,6 +1157,14 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 // retry one more time in case of template reload is required for 
Vmware case
 AsyncCallFuture future = null;
 if (templateId == null) {
+DiskOffering diskOffering = 
_entityMgr.findById(DiskOffering.class, volume.getDiskOfferingId());
+HypervisorType hyperType = 
vm.getVirtualMachine().getHypervisorType();
+
+// update the volume's hypervisor_ss_reserve from its disk 
offering (used for managed storage)
+updateHypervisorSnapshotReserveForVolume(diskOffering, volume, 
hyperType);
+
+volume = volFactory.getVolume(newVol.getId(), destPool);
+
 future = volService.createVolumeAsync(volume, destPool);
 } else {
 TemplateInfo templ = tmplFactory.getTemplate(templateId, 
DataStoreRole.Image);
@@ -1174,6 +1183,16 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 throw new StorageUnavailableException(

git commit: updated refs/heads/master to 3ef560d

[mtutkowski]

Updated Branches:
  refs/heads/master aa6dddc77 -> 3ef560d92


CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is 
created with option startvm=false


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

Branch: refs/heads/master
Commit: 3ef560d9250835eb02ffe8df9f17a0b6c928c88d
Parents: aa6dddc
Author: Mike Tutkowski 
Authored: Tue Jan 14 19:40:14 2014 -0700
Committer: Mike Tutkowski 
Committed: Thu Jan 16 12:15:18 2014 -0700

--
 .../apache/cloudstack/storage/volume/VolumeServiceImpl.java | 6 --
 .../xen/src/com/cloud/hypervisor/XenServerGuru.java | 6 +-
 server/src/com/cloud/storage/VolumeApiServiceImpl.java  | 9 ++---
 3 files changed, 15 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ef560d9/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
--
diff --git 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index ac507cf..3e5a546 100644
--- 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -158,8 +158,9 @@ public class VolumeServiceImpl implements VolumeService {
 return null;
 }
 
+@Override
 public boolean connectVolumeToHost(VolumeInfo volumeInfo, Host host, 
DataStore dataStore) {
-DataStoreDriver dataStoreDriver = dataStore.getDriver();
+DataStoreDriver dataStoreDriver = dataStore != null ? 
dataStore.getDriver() : null;
 
 if (dataStoreDriver instanceof PrimaryDataStoreDriver) {
 return 
((PrimaryDataStoreDriver)dataStoreDriver).connectVolumeToHost(volumeInfo, host, 
dataStore);
@@ -168,8 +169,9 @@ public class VolumeServiceImpl implements VolumeService {
 return false;
 }
 
+@Override
 public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host, 
DataStore dataStore) {
-DataStoreDriver dataStoreDriver = dataStore.getDriver();
+DataStoreDriver dataStoreDriver = dataStore != null ? 
dataStore.getDriver() : null;
 
 if (dataStoreDriver instanceof PrimaryDataStoreDriver) {
 
((PrimaryDataStoreDriver)dataStoreDriver).disconnectVolumeFromHost(volumeInfo, 
host, dataStore);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ef560d9/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
index 4f21a02..529e261 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
@@ -108,7 +108,11 @@ public class XenServerGuru extends HypervisorGuruBase 
implements HypervisorGuru
 if (volume.getVolumeType() == Volume.Type.DATADISK) {
 StoragePoolVO storagePool = 
_storagePoolDao.findById(volume.getPoolId());
 
-if (storagePool.isManaged()) {
+// storagePool should be null if we are expunging a volume 
that was never
+// attached to a VM that was started (the "trick" for 
storagePool to be null
+// is that none of the VMs this volume may have been 
attached to were ever started,
+// so the volume was never assigned to a storage pool)
+if (storagePool != null && storagePool.isManaged()) {
 DataTO volTO = 
_volFactory.getVolume(volume.getId()).getTO();
 DiskTO disk = new DiskTO(volTO, volume.getDeviceId(), 
volume.getPath(), volume.getVolumeType());
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ef560d9/server/src/com/cloud/storage/VolumeApiServiceImpl.java
--
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java 
b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index ac0c438..8d475dd 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1482,12 +1482,13 @@ public class VolumeApiServiceImpl extends ManagerBase 
implements VolumeApiServic
 }
 }
 
-DataStore data

git commit: updated refs/heads/master to e9c9887

[mtutkowski]

Updated Branches:
  refs/heads/master 3ef560d92 -> e9c9887ee


CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is 
created with option startvm=false

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

Branch: refs/heads/master
Commit: e9c9887ee03b1987c6554f63e0f9a74d74f7a023
Parents: 3ef560d
Author: Mike Tutkowski 
Authored: Thu Jan 16 12:20:54 2014 -0700
Committer: Mike Tutkowski 
Committed: Thu Jan 16 12:20:54 2014 -0700

--
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  8 ++-
 .../orchestration/VolumeOrchestrator.java   | 19 ++
 .../xen/resource/CitrixResourceBase.java| 63 +++-
 .../xen/resource/XenServerStorageProcessor.java | 16 +
 4 files changed, 86 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9c9887e/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 9894d31..806ac7e 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1127,15 +1127,17 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 Map details = disk.getDetails();
 boolean isManaged = details != null && 
Boolean.parseBoolean(details.get(DiskTO.MANAGED));
 
-if (isManaged && disk.getPath() == null) {
+if (isManaged) {
 Long volumeId = disk.getData().getId();
 VolumeVO volume = _volsDao.findById(volumeId);
 String iScsiName = volume.get_iScsiName();
 String path = iqnToPath.get(iScsiName);
 
-volume.setPath(path);
+if (path != null) {
+volume.setPath(path);
 
-_volsDao.update(volumeId, volume);
+_volsDao.update(volumeId, volume);
+}
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9c9887e/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
--
diff --git 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 0d6d718..8129b9d 100644
--- 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -408,6 +408,7 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 @DB
 public VolumeInfo createVolume(VolumeInfo volume, VirtualMachine vm, 
VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId, 
ServiceOffering offering,
 DiskOffering diskOffering, List avoids, long size, 
HypervisorType hyperType) {
+// update the volume's hypervisor_ss_reserve from its disk offering 
(used for managed storage)
 volume = updateHypervisorSnapshotReserveForVolume(diskOffering, 
volume, hyperType);
 
 StoragePool pool = null;
@@ -1089,6 +1090,14 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 // retry one more time in case of template reload is required for 
Vmware case
 AsyncCallFuture future = null;
 if (templateId == null) {
+DiskOffering diskOffering = 
_entityMgr.findById(DiskOffering.class, volume.getDiskOfferingId());
+HypervisorType hyperType = 
vm.getVirtualMachine().getHypervisorType();
+
+// update the volume's hypervisor_ss_reserve from its disk 
offering (used for managed storage)
+updateHypervisorSnapshotReserveForVolume(diskOffering, volume, 
hyperType);
+
+volume = volFactory.getVolume(newVol.getId(), destPool);
+
 future = volService.createVolumeAsync(volume, destPool);
 } else {
 TemplateInfo templ = tmplFactory.getTemplate(templateId, 
DataStoreRole.Image);
@@ -1106,6 +1115,16 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 throw new StorageUnavailableExcep

git commit: updated refs/heads/4.3 to 386b467

[dahn]

Updated Branches:
  refs/heads/4.3 c375ec62e -> 386b467ef


CLOUDSTACK-5886: set cidr field-width to 2048

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

Branch: refs/heads/4.3
Commit: 386b467ef34125ab1c6716dcf6afe9d3f1a34eb1
Parents: c375ec6
Author: Daan Hoogland 
Authored: Thu Jan 16 20:22:42 2014 +0100
Committer: Daan Hoogland 
Committed: Thu Jan 16 20:22:42 2014 +0100

--
 setup/db/db/schema-410to420.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/386b467e/setup/db/db/schema-410to420.sql
--
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 37e6826..b0be6c7 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2021,7 +2021,7 @@ CREATE TABLE `cloud`.`network_acl_item` (
   `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 
means all codes for the given ICMP type.',
   `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 
means all types.',
   `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be 
Ingress or Egress',
-  `cidr` varchar(255) COMMENT 'comma seperated cidr list',
+  `cidr` varchar(2048) COMMENT 'comma seperated cidr list',
   `number` int(10) NOT NULL COMMENT 'priority number of the acl item',
   `action` varchar(10) NOT NULL COMMENT 'rule action, allow or deny',
   PRIMARY KEY  (`id`),

Build failed in Jenkins: cloudstack-rat-master #3849

[Apache Jenkins Server]

See 

Changes:

[alena.prokharchyk] CLOUDSTACK-4987: when addNic to vm, don't make account 
check if the vm belongs to ROOT admin

[mike.tutkowski] CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, 
if the vm is created with option startvm=false

[mike.tutkowski] CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, 
if the vm is created with option startvm=false

--
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision e9c9887ee03b1987c6554f63e0f9a74d74f7a023 (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson3118797197231463822.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jque

git commit: updated refs/heads/master to 3f49f8c

[edison]

Updated Branches:
  refs/heads/master e9c9887ee -> 3f49f8ca6


Fix RAT


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

Branch: refs/heads/master
Commit: 3f49f8ca61ff3d1ac04d87775514828f931b00b6
Parents: e9c9887
Author: Edison Su 
Authored: Thu Jan 16 12:10:38 2014 -0800
Committer: Edison Su 
Committed: Thu Jan 16 12:10:38 2014 -0800

--
 .../NexentaPrimaryDataStoreLifeCycle.java   | 41 ++--
 .../datastore/provider/NexentaHostListener.java | 18 +
 .../datastore/util/NexentaNmsClient.java| 27 ++---
 .../datastore/util/NexentaStorAppliance.java| 23 +--
 .../util/NexentaStorApplianceTest.java  | 18 +
 .../storage/datastore/util/NexentaUtilTest.java | 18 +
 6 files changed, 125 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f49f8ca/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
--
diff --git 
a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
 
b/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
index 775e6b5..c7ce33a 100644
--- 
a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
+++ 
b/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/lifecylce/NexentaPrimaryDataStoreLifeCycle.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
 package org.apache.cloudstack.storage.datastore.lifecylce;
 
 import java.util.ArrayList;
@@ -6,25 +24,24 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import com.cloud.dc.DataCenterVO;
-import com.cloud.host.HostVO;
-import com.cloud.resource.ResourceManager;
-import com.cloud.storage.StorageManager;
-import com.cloud.storage.StoragePoolAutomation;
-import org.apache.cloudstack.storage.datastore.util.NexentaUtil;
-import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
-import org.apache.log4j.Logger;
-
+import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreLifeCycle;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreParameters;
-import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
 import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
-import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
+import org.apache.cloudstack.storage.datastore.util.NexentaUtil;
+import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
+import org.apache.log4j.Logger;
 
-import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.agent.api.StoragePoolInfo;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.resource.ResourceManager;
+import com.cloud.storage.StorageManager;
+import com.cloud.storage.StoragePoolAutomation;
 
 public class NexentaPrimaryDataStoreLifeCycle
 implements PrimaryDataStoreLifeCycle {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f49f8ca/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/provider/NexentaHostListener.java
--
diff --git 
a/plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/provider/NexentaHostListener.java
 
b/plugins/storag

Jenkins build is back to normal : cloudstack-rat-master #3850

[Apache Jenkins Server]

See 

git commit: updated refs/heads/4.2 to a615b72

[dahn]

Updated Branches:
  refs/heads/4.2 4f3088929 -> a615b72f2


CLOUDSTACK-5886: enlarged cidr field

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

Branch: refs/heads/4.2
Commit: a615b72f2f910f4c0ab64d978201bd27d222a317
Parents: 4f30889
Author: Daan Hoogland 
Authored: Thu Jan 16 21:21:54 2014 +0100
Committer: Daan Hoogland 
Committed: Thu Jan 16 21:21:54 2014 +0100

--
 setup/db/db/schema-410to420.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a615b72f/setup/db/db/schema-410to420.sql
--
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index f44ba96..6eb9913 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -1848,7 +1848,7 @@ CREATE TABLE `cloud`.`network_acl_item` (
   `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 
means all codes for the given ICMP type.',
   `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 
means all types.',
   `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be 
Ingress or Egress',
-  `cidr` varchar(255) COMMENT 'comma seperated cidr list',
+  `cidr` varchar(2048) COMMENT 'comma seperated cidr list',
   `number` int(10) NOT NULL COMMENT 'priority number of the acl item',
   `action` varchar(10) NOT NULL COMMENT 'rule action, allow or deny',
   PRIMARY KEY  (`id`),

git commit: updated refs/heads/master to 3b8e5bd

[dahn]

Updated Branches:
  refs/heads/master 3f49f8ca6 -> 3b8e5bdc8


CLOUDSTACK-5886: cidr field-width to 2048

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

Branch: refs/heads/master
Commit: 3b8e5bdc8649246238d163812eeb4eba6c55a7db
Parents: 3f49f8c
Author: Daan Hoogland 
Authored: Thu Jan 16 21:46:53 2014 +0100
Committer: Daan Hoogland 
Committed: Thu Jan 16 21:46:53 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b8e5bdc/setup/db/db/schema-421to430.sql
--
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index e14f0da..71f07d1 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -896,3 +896,4 @@ ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `speed`;
 
 INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, 
hypervisor_version, max_guests_limit, security_group_enabled, 
max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, 
vm_snapshot_enabled) VALUES (UUID(), 'VMware', '5.5', 128, 0, 13, 32, 1, 1);
 
+ALTER TABLE `cloud`.`network_acl_item` modify `cidr` varchar(2048);

git commit: updated refs/heads/4.3 to 233f0f6

[dahn]

Updated Branches:
  refs/heads/4.3 386b467ef -> 233f0f618


CLOUDSTACK-5886: cidr field-width to 2048

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

Branch: refs/heads/4.3
Commit: 233f0f618f2d3d93442a0f33aab929bdd5aba7f0
Parents: 386b467
Author: Daan Hoogland 
Authored: Thu Jan 16 21:46:53 2014 +0100
Committer: Daan Hoogland 
Committed: Thu Jan 16 22:15:36 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/233f0f61/setup/db/db/schema-421to430.sql
--
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index c4ef5e5..8bfec37 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -889,3 +889,4 @@ ALTER TABLE `cloud`.`vm_instance` DROP COLUMN `speed`;
 
 INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, 
hypervisor_version, max_guests_limit, security_group_enabled, 
max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, 
vm_snapshot_enabled) VALUES (UUID(), 'VMware', '5.5', 128, 0, 13, 32, 1, 1);
 
+ALTER TABLE `cloud`.`network_acl_item` modify `cidr` varchar(2048);

git commit: updated refs/heads/4.3 to 9c32605

[alena1108]

Updated Branches:
  refs/heads/4.3 233f0f618 -> 9c32605f2


CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is 
made by ROOT admin


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

Branch: refs/heads/4.3
Commit: 9c32605f2b877134df4b512dea4ea8c4fa8e65e9
Parents: 233f0f6
Author: Alena Prokharchyk 
Authored: Thu Jan 16 13:27:09 2014 -0800
Committer: Alena Prokharchyk 
Committed: Thu Jan 16 13:35:04 2014 -0800

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c32605f/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index a3dbcb7..ea38d12 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -987,8 +987,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 throw new InvalidParameterValueException("unable to find a network 
with id " + networkId);
 }
 
-Account vmOwner = _accountMgr.getAccount(vmInstance.getAccountId());
-if (vmOwner.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
 if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
 && !(network.getAclType() == ACLType.Account && 
network.getAccountId() == vmInstance.getAccountId())) {
 throw new InvalidParameterValueException("only shared network 
or isolated network with the same account_id can be added to vmId: " + vmId);
@@ -2799,8 +2798,8 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 + zone.getId());
 }
 
-Account vmOwner = _accountMgr.getAccount(accountId);
-if (vmOwner.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+//relax the check if the caller is admin account
+if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
 if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
 && !(network.getAclType() == ACLType.Account && 
network.getAccountId() == accountId)) {
 throw new InvalidParameterValueException("only shared 
network or isolated network with the same account_id can be added to vm");

git commit: updated refs/heads/master to 47fd67b

[alena1108]

Updated Branches:
  refs/heads/master 3b8e5bdc8 -> 47fd67b7f


CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is 
made by ROOT admin


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

Branch: refs/heads/master
Commit: 47fd67b7faad2d41b71bbcd7bbd8672e50693573
Parents: 3b8e5bd
Author: Alena Prokharchyk 
Authored: Thu Jan 16 13:27:09 2014 -0800
Committer: Alena Prokharchyk 
Committed: Thu Jan 16 13:34:45 2014 -0800

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47fd67b7/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 5a4cea4..f57e1b4 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -966,8 +966,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 throw new InvalidParameterValueException("unable to find a network 
with id " + networkId);
 }
 
-Account vmOwner = _accountMgr.getAccount(vmInstance.getAccountId());
-if (vmOwner.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
 if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
 && !(network.getAclType() == ACLType.Account && 
network.getAccountId() == vmInstance.getAccountId())) {
 throw new InvalidParameterValueException("only shared network 
or isolated network with the same account_id can be added to vmId: " + vmId);
@@ -2638,8 +2637,8 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 throw new InvalidParameterValueException("Network id=" + 
network.getId() + " doesn't belong to zone " + zone.getId());
 }
 
-Account vmOwner = _accountMgr.getAccount(accountId);
-if (vmOwner.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+//relax the check if the caller is admin account
+if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
 if (!(network.getGuestType() == Network.GuestType.Shared && 
network.getAclType() == ACLType.Domain)
 && !(network.getAclType() == ACLType.Account && 
network.getAccountId() == accountId)) {
 throw new InvalidParameterValueException("only shared 
network or isolated network with the same account_id can be added to vm");

git commit: updated refs/heads/4.3 to 694d39d

[jessicawang]

Updated Branches:
  refs/heads/4.3 9c32605f2 -> 694d39d0f


CLOUDSTACK-5889: UI > VM Wizard > corresonding UI change for new change of 
deployVirtualMachine API (that customparameter parameter has been renamed)


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

Branch: refs/heads/4.3
Commit: 694d39d0fdb5777e166d95eb8619e2404591f95e
Parents: 9c32605
Author: Jessica Wang 
Authored: Thu Jan 16 14:01:09 2014 -0800
Committer: Jessica Wang 
Committed: Thu Jan 16 14:01:17 2014 -0800

--
 ui/scripts/instanceWizard.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/694d39d0/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index c83080c..646ffbf 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -613,17 +613,17 @@
 if 
(args.$wizard.find('input[name=compute-cpu-cores]').parent().parent().css('display')
 != 'none') {
if 
(args.$wizard.find('input[name=compute-cpu-cores]').val().length > 0)  {
 
$.extend(deployVmData, {
-   'customparameters[0].cpuNumber' : 
args.$wizard.find('input[name=compute-cpu-cores]').val()
+   'details[0].cpuNumber' : 
args.$wizard.find('input[name=compute-cpu-cores]').val()
});
}
if 
(args.$wizard.find('input[name=compute-cpu]').val().length > 0)  {
$.extend(deployVmData, {
-   'customparameters[0].cpuSpeed' : 
args.$wizard.find('input[name=compute-cpu]').val()
+   'details[0].cpuSpeed' : 
args.$wizard.find('input[name=compute-cpu]').val()
});
}
if 
(args.$wizard.find('input[name=compute-memory]').val().length > 0)  { 
$.extend(deployVmData, {
-   'customparameters[0].memory' : 
args.$wizard.find('input[name=compute-memory]').val()
+   'details[0].memory' : 
args.$wizard.find('input[name=compute-memory]').val()
});
}   
 }

git commit: updated refs/heads/master to 3f359bb

[jessicawang]

Updated Branches:
  refs/heads/master 47fd67b7f -> 3f359bb64


CLOUDSTACK-5889: UI > VM Wizard > corresonding UI change for new change of 
deployVirtualMachine API (that customparameter parameter has been renamed)


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

Branch: refs/heads/master
Commit: 3f359bb641b27211762e8274c13488f24f96f48c
Parents: 47fd67b
Author: Jessica Wang 
Authored: Thu Jan 16 14:01:09 2014 -0800
Committer: Jessica Wang 
Committed: Thu Jan 16 14:02:11 2014 -0800

--
 ui/scripts/instanceWizard.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f359bb6/ui/scripts/instanceWizard.js
--
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index c83080c..646ffbf 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -613,17 +613,17 @@
 if 
(args.$wizard.find('input[name=compute-cpu-cores]').parent().parent().css('display')
 != 'none') {
if 
(args.$wizard.find('input[name=compute-cpu-cores]').val().length > 0)  {
 
$.extend(deployVmData, {
-   'customparameters[0].cpuNumber' : 
args.$wizard.find('input[name=compute-cpu-cores]').val()
+   'details[0].cpuNumber' : 
args.$wizard.find('input[name=compute-cpu-cores]').val()
});
}
if 
(args.$wizard.find('input[name=compute-cpu]').val().length > 0)  {
$.extend(deployVmData, {
-   'customparameters[0].cpuSpeed' : 
args.$wizard.find('input[name=compute-cpu]').val()
+   'details[0].cpuSpeed' : 
args.$wizard.find('input[name=compute-cpu]').val()
});
}
if 
(args.$wizard.find('input[name=compute-memory]').val().length > 0)  { 
$.extend(deployVmData, {
-   'customparameters[0].memory' : 
args.$wizard.find('input[name=compute-memory]').val()
+   'details[0].memory' : 
args.$wizard.find('input[name=compute-memory]').val()
});
}   
 }

git commit: updated refs/heads/master to dcf9607

[alena1108]

Updated Branches:
  refs/heads/master 3f359bb64 -> dcf9607a4


Fixed code style errors breaking the build


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

Branch: refs/heads/master
Commit: dcf9607a4667fd41898ae70399acd0ba1411c077
Parents: 3f359bb
Author: Alena Prokharchyk 
Authored: Thu Jan 16 14:04:58 2014 -0800
Committer: Alena Prokharchyk 
Committed: Thu Jan 16 14:05:20 2014 -0800

--
 tools/appliance/convert/Convert.java | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dcf9607a/tools/appliance/convert/Convert.java
--
diff --git a/tools/appliance/convert/Convert.java 
b/tools/appliance/convert/Convert.java
index e29fdb2..21b20fc 100644
--- a/tools/appliance/convert/Convert.java
+++ b/tools/appliance/convert/Convert.java
@@ -5,9 +5,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
@@ -15,7 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import javax.xml.transform.*;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import java.io.File;

git commit: updated refs/heads/master to 52406a8

[bfederle]

Updated Branches:
  refs/heads/master dcf9607a4 -> 52406a840


Rename 'Sockets' -> 'CPU Sockets'


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

Branch: refs/heads/master
Commit: 52406a840172c71c001d3e51bad35283253779c8
Parents: dcf9607
Author: Brian Federle 
Authored: Thu Jan 16 15:15:37 2014 -0800
Committer: Brian Federle 
Committed: Thu Jan 16 15:16:00 2014 -0800

--
 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/52406a84/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 f186fbf..39b4c3f 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -31,7 +31,7 @@ label.smb.password=SMB Password
 label.smb.domain=SMB Domain
 label.hypervisors=Hypervisors
 label.home=Home
-label.sockets=Sockets
+label.sockets=CPU Sockets
 label.root.disk.size=Root disk size
 label.s3.nfs.server=S3 NFS Server
 label.s3.nfs.path=S3 NFS Path

git commit: updated refs/heads/master to 07f73ec

[kocka]

Updated Branches:
  refs/heads/master 52406a840 -> 07f73ec05


Null-safety in http header handling

The http Content-Type header may not always be present in the response, in such 
cases the getResponseHeader will return null and this leads to NPE, therefore 
the presence of the header must be checked.

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/07f73ec0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/07f73ec0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/07f73ec0

Branch: refs/heads/master
Commit: 07f73ec05408d8ad9727f763826d862a23a040dd
Parents: 52406a8
Author: Laszlo Hornyak 
Authored: Thu Jan 16 23:17:45 2014 +0100
Committer: Laszlo Hornyak 
Committed: Fri Jan 17 00:19:17 2014 +0100

--
 .../cloudstack/network/opendaylight/api/resources/Action.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07f73ec0/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/Action.java
--
diff --git 
a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/Action.java
 
b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/Action.java
index fb764ba..748b50b 100644
--- 
a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/Action.java
+++ 
b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/Action.java
@@ -31,6 +31,7 @@ import 
org.apache.cloudstack.network.opendaylight.api.NeutronRestApi;
 import org.apache.cloudstack.network.opendaylight.api.NeutronRestApiException;
 import org.apache.cloudstack.network.opendaylight.api.NeutronRestFactory;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethodBase;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.NameValuePair;
@@ -270,7 +271,8 @@ public abstract class Action {
 private String responseToErrorMessage(final HttpMethodBase method) {
 assert method.isRequestSent() : "no use getting an error message 
unless the request is sent";
 
-if 
(TEXT_HTML_CONTENT_TYPE.equals(method.getResponseHeader(CONTENT_TYPE).getValue()))
 {
+final Header contentTypeHeader = 
method.getResponseHeader(CONTENT_TYPE);
+if (contentTypeHeader != null && 
TEXT_HTML_CONTENT_TYPE.equals(contentTypeHeader.getValue())) {
 // The error message is the response content
 // Safety margin of 1024 characters, anything longer is probably
 // useless and will clutter the logs

git commit: updated refs/heads/master to bd79fb3

[alena1108]

Updated Branches:
  refs/heads/master 07f73ec05 -> bd79fb33a


CLOUDSTACK-5870: API support for retrieving user data


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

Branch: refs/heads/master
Commit: bd79fb33a6978a9dbe7933bcda1579238da4bb27
Parents: 07f73ec
Author: Alena Prokharchyk 
Authored: Thu Jan 16 15:31:01 2014 -0800
Committer: Alena Prokharchyk 
Committed: Thu Jan 16 15:31:18 2014 -0800

--
 api/src/com/cloud/vm/UserVmService.java |  8 +++
 .../api/command/admin/vm/GetVMUserDataCmd.java  | 63 
 .../api/response/VMUserDataResponse.java| 26 
 client/tomcatconf/commands.properties.in|  1 +
 .../com/cloud/server/ManagementServerImpl.java  |  2 +
 server/src/com/cloud/vm/UserVmManagerImpl.java  | 12 
 6 files changed, 112 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd79fb33/api/src/com/cloud/vm/UserVmService.java
--
diff --git a/api/src/com/cloud/vm/UserVmService.java 
b/api/src/com/cloud/vm/UserVmService.java
index e02573d..51a8fdf 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -461,4 +461,12 @@ public interface UserVmService {
 
 UserVm expungeVm(long vmId) throws ResourceUnavailableException, 
ConcurrentOperationException;
 
+/**
+ * Finds and returns an encrypted password for a VM.
+ *
+ * @param  userVmId
+ * @return Base64 encoded userdata
+ */
+String getVmUserData(long vmId);
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd79fb33/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java 
b/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
new file mode 100644
index 000..b02dc11
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
@@ -0,0 +1,63 @@
+package org.apache.cloudstack.api.command.admin.vm;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VMUserDataResponse;
+import org.apache.log4j.Logger;
+
+import com.cloud.user.Account;
+import com.cloud.uservm.UserVm;
+
+@APICommand(name = "getVirtualMachineUserData", description = "Returns user 
data associated with the VM", responseObject = VMUserDataResponse.class, since 
= "4.4")
+public class GetVMUserDataCmd extends BaseCmd {
+public static final Logger s_logger = 
Logger.getLogger(GetVMUserDataCmd.class);
+private static final String s_name = "getvirtualmachineuserdataresponse";
+
+/
+ API parameters /
+/
+
+@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = 
CommandType.UUID, entityType = UserVmResponse.class, required = true, 
description = "The ID of the virtual machine")
+private Long vmId;
+
+/
+/// Accessors ///
+/
+
+public long getId() {
+return vmId;
+}
+
+/
+/// API Implementation///
+/
+
+@Override
+public void execute() {
+String userData = _userVmService.getVmUserData(getId());
+VMUserDataResponse resp = new VMUserDataResponse();
+resp.setVmId(_entityMgr.findById(UserVm.class, getId()).getUuid());
+resp.setUserData(userData);
+resp.setObjectName("virtualmachineuserdata");
+resp.setResponseName(getCommandName());
+this.setResponseObject(resp);
+}
+
+@Override
+public long getEntityOwnerId() {
+UserVm userVm = _entityMgr.findById(UserVm.class, getId());
+if (userVm != null) {
+return userVm.getAccountId();
+}
+
+return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent 
this command to SYSTEM so ERROR events are tracked
+}
+
+@Override
+public String getCommandName() {
+return s_name;
+}
+}

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

Build failed in Jenkins: cloudstack-rat-master #3855

[Apache Jenkins Server]

See 

Changes:

[alena.prokharchyk] CLOUDSTACK-5870: API support for retrieving user data

--
Started by an SCM change
Building remotely on ubuntu3 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision bd79fb33a6978a9dbe7933bcda1579238da4bb27 (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson6481631121335694961.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: sy

[2/2] git commit: updated refs/heads/master to 0cdf0f6

[yasker]

CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use 
routeProxy


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

Branch: refs/heads/master
Commit: 0cdf0f6f67c99a06fc1b94c2f2a38eff020f3f67
Parents: b703b43
Author: Sheng Yang 
Authored: Thu Jan 16 12:48:27 2014 -0800
Committer: Sheng Yang 
Committed: Thu Jan 16 16:03:09 2014 -0800

--
 .../virtualnetwork/VirtualRoutingResource.java  |  98 +++-
 .../vmware/resource/VmwareResource.java | 192 ---
 .../xen/resource/CitrixResourceBase.java|   2 +-
 scripts/network/domr/bumpUpPriority.sh  |  47 
 scripts/network/domr/call_dnsmasq.sh|  27 ---
 scripts/network/domr/dhcp_entry.sh  |  82 ---
 scripts/vm/hypervisor/xenserver/vmops   |  47 +---
 .../config/opt/cloud/bin/bumpup_priority.sh |  19 ++
 .../debian/config/opt/cloud/bin/dnsmasq.sh  | 130 +++
 .../debian/config/opt/cloud/bin/edithosts.sh| 234 +++
 .../debian/config/root/bumpup_priority.sh   |  19 --
 systemvm/patches/debian/config/root/dnsmasq.sh  | 130 ---
 .../patches/debian/config/root/edithosts.sh | 234 ---
 13 files changed, 517 insertions(+), 744 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cdf0f6f/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 8478b31..f469d8a 100755
--- 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -16,31 +16,6 @@
 // under the License.
 package com.cloud.agent.resource.virtualnetwork;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.InetSocketAddress;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.channels.SocketChannel;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.naming.ConfigurationException;
-
-import com.cloud.agent.api.routing.SetMonitorServiceCommand;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-
-import com.google.gson.Gson;
-
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.BumpUpPriorityCommand;
 import com.cloud.agent.api.CheckRouterAnswer;
@@ -66,6 +41,7 @@ import com.cloud.agent.api.routing.RemoteAccessVpnCfgCommand;
 import com.cloud.agent.api.routing.SavePasswordCommand;
 import com.cloud.agent.api.routing.SetFirewallRulesAnswer;
 import com.cloud.agent.api.routing.SetFirewallRulesCommand;
+import com.cloud.agent.api.routing.SetMonitorServiceCommand;
 import com.cloud.agent.api.routing.SetPortForwardingRulesAnswer;
 import com.cloud.agent.api.routing.SetPortForwardingRulesCommand;
 import com.cloud.agent.api.routing.SetPortForwardingRulesVpcCommand;
@@ -92,6 +68,27 @@ import com.cloud.utils.net.NetUtils;
 import com.cloud.utils.script.OutputInterpreter;
 import com.cloud.utils.script.Script;
 import com.cloud.utils.ssh.SshHelper;
+import com.google.gson.Gson;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+
+import javax.ejb.Local;
+import javax.naming.ConfigurationException;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.channels.SocketChannel;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * VirtualNetworkResource controls and configures virtual networking
@@ -107,14 +104,12 @@ public class VirtualRoutingResource implements Manager {
 private String _publicIpAddress;
 private String _firewallPath;
 private String _loadbPath;
-private String _dhcpEntryPath;
 private String _publicEthIf;
 private String _privateEthIf;
 private String _bumpUpPriorityPath;
 private String _routerProxyPath;
 private String _createIpAliasPath;
 private String _deleteIpAliasPath;
-private String _cal

[1/2] git commit: updated refs/heads/master to 0cdf0f6

[yasker]

Updated Branches:
  refs/heads/master bd79fb33a -> 0cdf0f6f6


CLOUDSTACK-5779: Refactor mechanism for calling routerProxy in CitrixResource


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

Branch: refs/heads/master
Commit: b703b43d7c7495984f841ebb7587882da179e151
Parents: bd79fb3
Author: Sheng Yang 
Authored: Thu Jan 16 12:48:27 2014 -0800
Committer: Sheng Yang 
Committed: Thu Jan 16 16:02:53 2014 -0800

--
 .../xen/resource/CitrixResourceBase.java| 222 +--
 1 file changed, 99 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b703b43d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index acdc70f..2568a21 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -16,46 +16,6 @@
 // under the License.
 package com.cloud.hypervisor.xen.resource;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Queue;
-import java.util.Random;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.ejb.Local;
-import javax.naming.ConfigurationException;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
-import org.apache.cloudstack.storage.to.TemplateObjectTO;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-import org.apache.xmlrpc.XmlRpcException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
 import com.cloud.agent.IAgentControl;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.AttachIsoCommand;
@@ -274,6 +234,44 @@ import com.xensource.xenapi.VLAN;
 import com.xensource.xenapi.VM;
 import com.xensource.xenapi.VMGuestMetrics;
 import com.xensource.xenapi.XenAPIObject;
+import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
+import org.apache.cloudstack.storage.to.TemplateObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+import org.apache.xmlrpc.XmlRpcException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+import javax.ejb.Local;
+import javax.naming.ConfigurationException;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Queue;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
 
 
 /**
@@ -623,6 +621,12 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 }
 
+public String routerProxy(String script, String routerIP, String args) {
+Connection conn = getConnection();
+String proxyArgs = script + " " + routerIP + " " + args;
+return callHostPlugin(conn, "vmops", "routerProxy", "args", proxyArgs);
+}
+
 private Answer execute(PerformanceMonitorCommand cmd) {
 Connection conn = getConnection();
 String perfMon = getPerfMon(conn, cmd.getParams(), cmd.getWait());
@@ -1967,12 +1971,11 @@ public abstract class Citr

Build failed in Jenkins: cloudstack-rat-master #3856

[Apache Jenkins Server]

See 

Changes:

[sheng.yang] CLOUDSTACK-5779: Refactor mechanism for calling routerProxy in 
CitrixResource

[sheng.yang] CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh 
to use routeProxy

--
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision 0cdf0f6f67c99a06fc1b94c2f2a38eff020f3f67 (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson5831140555746751691.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: 

git commit: updated refs/heads/master to 008b029

[likithas]

Updated Branches:
  refs/heads/master 0cdf0f6f6 -> 008b029a2


CLOUDSTACK-5891.[VMware] If a template has been registered and 
"cpu.corespersocket=X" template details have been added for it,
then any instance deployed from that template should have X cores per socket


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

Branch: refs/heads/master
Commit: 008b029a29460d883ac7d645877e6f4f2945b1e1
Parents: 0cdf0f6
Author: Likitha Shetty 
Authored: Tue Nov 26 15:22:58 2013 +0530
Committer: Likitha Shetty 
Committed: Fri Jan 17 11:00:48 2014 +0530

--
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/008b029a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index a2073ea..5d7cf17 100755
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2744,6 +2744,12 @@ public class VmwareResource implements 
StoragePoolResource, ServerResource, Vmwa
 
vmConfigSpec.setCpuHotAddEnabled(vmMo.isCpuHotAddSupported(guestOsId));
 configNestedHVSupport(vmMo, vmSpec, vmConfigSpec);
 
+ // Check for multi-cores per socket settings
+String coresPerSocket = 
vmSpec.getDetails().get("cpu.corespersocket");
+if (coresPerSocket != null) {
+
vmConfigSpec.setNumCoresPerSocket(NumbersUtil.parseInt(coresPerSocket, 1));
+}
+
 VirtualDeviceConfigSpec[] deviceConfigSpecArray = new 
VirtualDeviceConfigSpec[totalChangeDevices];
 int i = 0;
 int ideUnitNumber = 0;

Build failed in Jenkins: cloudstack-rat-master #3857

[Apache Jenkins Server]

See 

Changes:

[likitha.shetty] CLOUDSTACK-5891.[VMware] If a template has been registered and 
"cpu.corespersocket=X" template details have been added for it,

--
Started by an SCM change
Building remotely on ubuntu4 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision 008b029a29460d883ac7d645877e6f4f2945b1e1 (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson8877887088962751814.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/requi

[1/2] git commit: updated refs/heads/4.3 to 04492ba

[kishan]

Updated Branches:
  refs/heads/4.3 694d39d0f -> 04492bad4
  refs/heads/master 008b029a2 -> c0f60651b


CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. 
Changed min required version for VR to 4.3


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

Branch: refs/heads/4.3
Commit: 04492bad4399de8503f2017e5934cfec6591833a
Parents: 694d39d
Author: Kishan Kavala 
Authored: Thu Jan 16 16:40:50 2014 +0530
Committer: Kishan Kavala 
Committed: Fri Jan 17 12:29:37 2014 +0530

--
 .../network/VirtualNetworkApplianceService.java |   2 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java  | 159 ---
 .../com/cloud/upgrade/dao/Upgrade421to430.java  | 137 
 3 files changed, 138 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04492bad/api/src/com/cloud/network/VirtualNetworkApplianceService.java
--
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java 
b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
index fb5d12a..cf93f64 100644
--- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
@@ -71,5 +71,5 @@ public interface VirtualNetworkApplianceService {
 
 List upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd);
 
-public static final String _minVRVersion = "4.2.0";
+public static final String _minVRVersion = "4.3.0";
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04492bad/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java 
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index ad3af2b..1ed1e3c 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -27,11 +27,9 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
@@ -83,7 +81,6 @@ public class Upgrade410to420 implements DbUpgrade {
 persistVswitchConfiguration(conn);
 createPlaceHolderNics(conn);
 updateRemoteAccessVpn(conn);
-updateSystemVmTemplates(conn);
 updateOverCommitRatioClusterDetails(conn);
 updatePrimaryStore(conn);
 addEgressFwRulesForSRXGuestNw(conn);
@@ -629,162 +626,6 @@ public class Upgrade410to420 implements DbUpgrade {
 
 }
 
-private void updateSystemVmTemplates(Connection conn) {
-// TODO: system vm template migration after storage refactoring
-PreparedStatement pstmt = null;
-ResultSet rs = null;
-s_logger.debug("Updating System Vm template IDs");
-try{
-//Get all hypervisors in use
-Set hypervisorsListInUse = new 
HashSet();
-try {
-pstmt = conn.prepareStatement("select 
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
-rs = pstmt.executeQuery();
-while(rs.next()){
-switch (HypervisorType.getType(rs.getString(1))) {
-case XenServer: 
hypervisorsListInUse.add(HypervisorType.XenServer);
-break;
-case KVM:   
hypervisorsListInUse.add(HypervisorType.KVM);
-break;
-case VMware:
hypervisorsListInUse.add(HypervisorType.VMware);
-break;
-case Hyperv:
hypervisorsListInUse.add(HypervisorType.Hyperv);
-break;
-case LXC:   
hypervisorsListInUse.add(HypervisorType.LXC);
-break;
-}
-}
-} catch (SQLException e) {
-throw new CloudRuntimeException("Error while listing 
hypervisors in use", e);
-}
-
-Map NewTemplateNameList = new 
HashMap(){
-{   put(HypervisorType.XenServer, "systemvm-xenserver-4.2");
-put(HypervisorType.VMware, "systemvm-vmware-4.2");
-put(HypervisorType.KVM, "systemvm-kvm-4.2");
-put(HypervisorType.LXC, "systemvm-lxc-4.2");
-put(HypervisorType.Hyperv, "systemvm-hyperv-4.2");
-}
-

[2/2] git commit: updated refs/heads/master to c0f6065

[kishan]

CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. 
Changed min required version for VR to 4.3


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

Branch: refs/heads/master
Commit: c0f60651b94828d52407b3a6b6c47c451dabb45f
Parents: 008b029
Author: Kishan Kavala 
Authored: Fri Jan 17 12:51:16 2014 +0530
Committer: Kishan Kavala 
Committed: Fri Jan 17 12:51:16 2014 +0530

--
 .../network/VirtualNetworkApplianceService.java |   2 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java  | 170 ---
 .../com/cloud/upgrade/dao/Upgrade421to430.java  | 137 +++
 3 files changed, 138 insertions(+), 171 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f60651/api/src/com/cloud/network/VirtualNetworkApplianceService.java
--
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java 
b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
index fa3ef6d..a9d9c52 100644
--- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
@@ -69,5 +69,5 @@ public interface VirtualNetworkApplianceService {
 
 List upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd);
 
-public static final String MinVRVersion = "4.2.0";
+public static final String MinVRVersion = "4.3.0";
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0f60651/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java 
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index a933d03..82b6d84 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -27,11 +27,9 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
@@ -83,7 +81,6 @@ public class Upgrade410to420 implements DbUpgrade {
 persistVswitchConfiguration(conn);
 createPlaceHolderNics(conn);
 updateRemoteAccessVpn(conn);
-updateSystemVmTemplates(conn);
 updateOverCommitRatioClusterDetails(conn);
 updatePrimaryStore(conn);
 addEgressFwRulesForSRXGuestNw(conn);
@@ -634,173 +631,6 @@ public class Upgrade410to420 implements DbUpgrade {
 
 }
 
-private void updateSystemVmTemplates(Connection conn) {
-// TODO: system vm template migration after storage refactoring
-PreparedStatement pstmt = null;
-ResultSet rs = null;
-s_logger.debug("Updating System Vm template IDs");
-try {
-//Get all hypervisors in use
-Set hypervisorsListInUse = new 
HashSet();
-try {
-pstmt = conn.prepareStatement("select 
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
-rs = pstmt.executeQuery();
-while (rs.next()) {
-switch (HypervisorType.getType(rs.getString(1))) {
-case XenServer:
-hypervisorsListInUse.add(HypervisorType.XenServer);
-break;
-case KVM:
-hypervisorsListInUse.add(HypervisorType.KVM);
-break;
-case VMware:
-hypervisorsListInUse.add(HypervisorType.VMware);
-break;
-case Hyperv:
-hypervisorsListInUse.add(HypervisorType.Hyperv);
-break;
-case LXC:
-hypervisorsListInUse.add(HypervisorType.LXC);
-break;
-}
-}
-} catch (SQLException e) {
-throw new CloudRuntimeException("Error while listing 
hypervisors in use", e);
-}
-
-Map NewTemplateNameList = new 
HashMap() {
-{
-put(HypervisorType.XenServer, "systemvm-xenserver-4.2");
-put(HypervisorType.VMware, "systemvm-vmware-4.2");
-put(HypervisorType.KVM, "systemvm-kvm-4.2");
-put(HypervisorType.

Build failed in Jenkins: cloudstack-rat-master #3858

[Apache Jenkins Server]

See 

Changes:

[kishan] CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit 
templates. Changed min required version for VR to 4.3

--
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision c0f60651b94828d52407b3a6b6c47c451dabb45f (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson3298935489744210232.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclu