Commit Graph

139 Commits

Author SHA1 Message Date
Rohit Yadav f5f6c2d1a7 use a preferable protocol that works on jvm 1.6
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-28 13:41:00 +05:30
Rohit Yadav 43f3d6ae19 services, awsapi: use better string comparision
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d08369ad06)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	awsapi/src/com/cloud/bridge/util/EC2RestAuth.java
	awsapi/src/com/cloud/bridge/util/RestAuth.java
2015-01-22 18:14:11 +05:30
Rohit Yadav 53c0ab856a CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef78)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	client/tomcatconf/server7-nonssl.xml.in
	client/tomcatconf/server7-ssl.xml.in
	engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
	plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/NeutronRestApi.java
	plugins/network-elements/palo-alto/src/com/cloud/network/utils/HttpClientWrapper.java
	plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/util/ElastistorUtil.java
	plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/util/NexentaNmsClient.java
	plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java
	pom.xml
	services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
	services/console-proxy/server/src/com/cloud/consoleproxy/util/RawHTTP.java
	systemvm/scripts/config_ssl.sh
	utils/src/com/cloud/utils/nio/NioClient.java
	utils/src/com/cloud/utils/rest/RESTServiceConnector.java
	utils/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
2015-01-21 18:24:54 +05:30
Rohit Yadav f47e32ec5f
cloudstack: change version to 4.3.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-11 19:08:36 +05:30
Rohit Yadav 2a72afdc48 Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path""
The revert was an error, sorry about that.
  - Rohit

This reverts commit 0aba9654f8.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-21 18:04:33 +05:30
Rohit Yadav 0aba9654f8 Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path"
This reverts commit c3c3bab41a.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-20 20:35:45 +05:30
Rohit Yadav c3c3bab41a Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path
This reverts commit e6d00bcc66.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-20 14:04:43 +05:30
Rohit Yadav e6d00bcc66 Revert "Updating pom.xml version numbers for release 4.3.2-SNAPSHOT"
This reverts commit 063bb8f5b4.
2014-11-18 16:04:33 +05:30
Sebastien Goasguen 063bb8f5b4 Updating pom.xml version numbers for release 4.3.2-SNAPSHOT
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-16 09:16:47 -04:00
Rohit Yadav e2b49613d6 debian: fix version to 4.3.1 in debian log and console-proxy pom
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-05 16:58:41 +02:00
Sebastien Goasguen 41c0eaa14d Updating pom.xml version numbers for release 4.3.1
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-09-04 16:47:57 +02:00
Sebastien Goasguen a654894dbd Updating pom.xml version numbers for release 4.3.1-SNAPSHOT
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-08-25 09:16:27 -04:00
Anshul Gangwar cf7b62748d CLOUDSTACK-6001: Fixed hyperv vm console not working for 3 minutes after migration.
(cherry picked from commit fb87c85b2a)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-07 13:23:11 -08:00
Hiroaki KAWAI eece5100f0 Fix mock socket client/server test.
Normally a server will bind to 0.0.0.0, which is not an
address that a client can specify to connect to.
127.0.0.1 or ::1 will do.
(cherry picked from commit 1e9f066df2)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-02-02 16:02:35 -08:00
Sanjay Tripathi a5f73b7285 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download.
(cherry picked from commit 8024f2cc70)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 18:12:15 -08:00
Sanjay Tripathi 16dbb20b5d CLOUDSTACK-5900: Failed to delete template/ISO that failed to download.
(cherry picked from commit ae22d1990e)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 18:11:47 -08:00
Animesh Chaturvedi 70ba92fc14 Updating pom.xml version numbers for release 4.3.0
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-21 17:29:51 -08:00
Kelven Yang b2d5e374d9 CLOUDSTACK-5734: Fix the regression caused by adding hyper-V support 2014-01-10 17:58:48 -08:00
edison b180717473 CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed. 2014-01-08 14:35:15 -08:00
Anshul Gangwar ef51def9ff CLOUDSTACK-5716: fixed can't type special character in console view 2014-01-06 14:12:27 +05:30
Anshul Gangwar a4d4d4b09a CLOUDSTACK-5702: Fixed mouse doesn't work for console 2014-01-01 15:03:48 +05:30
Anshul Gangwar b55d9ecf53 CLOUDSTACK-5344 commit for console proxy rdp for hyperv 2013-12-31 18:14:53 +05:30
Sanjay Tripathi 526043b715 CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM. 2013-12-27 16:15:00 +05:30
Anshul Gangwar 4f3611f9c7 CLOUDSTACK-5344: Update to allow rdp console to access hyper-v vm virtual framebuffer. 2013-12-23 14:23:19 +05:30
Edison Su 6e4192dc43 CS-18564: create template from snapshot failed, due to the volume(the
snapshot created from) is deleted.
2013-12-20 12:43:06 -08:00
Min Chen c71e02c10c CLOUDSTACK-5454: Delete previous template and snapshot after migrating
NFS to S3 throws Error.
2013-12-11 16:39:37 -08:00
Hugo Trippaers 460b0df1c9 Just one level higher 2013-12-09 10:45:05 +05:30
Hugo Trippaers c6832379f8 Fix pom problems causing compilation failures. No master pom was set and this module uses maven standard directory locations 2013-12-09 10:44:56 +05:30
Devdeep Singh 61386f4068 Fix the console proxy rdp client build breaking with java 6 and make it part of regular build. 2013-11-11 16:16:34 +05:30
Devdeep Singh d27c6eb9a9 Fixing build break due to console proxy rdp client. 2013-11-08 16:13:24 +05:30
Devdeep Singh 810bfa90e2 Integrating the rdp client to get build in the regular build process. 2013-11-08 14:51:04 +05:30
Devdeep Singh a98c473dca Remote Desktop Protocol(RDP) client that is suitable for including in the console VM.
The client renders RDP to a window created by Java. It is important for Hyper-V support,
because Hyper-V provides access to the consoles of VMs that it is running over RDP.
2013-11-08 13:35:11 +05:30
Darren Shepherd 891b85d516 Add missing licenses 2013-10-23 15:20:08 -07:00
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Min Chen 25acfbad78 CLOUDSTACK-4816:provide configurable option to choose single vs
multipart upload to S3 object storage based on object size.
2013-10-17 10:28:59 -07:00
Hugo Trippaers 71dc43ebb0 Remove duplicate scripts and move the remaining items to the systemvm project 2013-10-14 08:02:35 +02:00
Min Chen f1895ea39a CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable. 2013-10-04 18:21:25 -07:00
Chris Suich 180cfa19e8 Refactor Storage Related Resource Code
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-04 13:06:42 -07:00
Darren Shepherd 67186429e1 Spring Modularization
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Hugo Trippaers 15a97ec412 Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00
Hugo Trippaers 17977b426b Forgot to add a few items to the commit to move the systemvm 2013-09-20 18:52:47 +08:00
Hugo Trippaers 6c26104282 Move the system vm to a separate maven project.
All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understand and makes it clear that the systemvm is a separate item. It alos means that it can be excluded from the build entirely by not adding the systemvm profile, this will speed up the compiles somewhat.
2013-09-20 18:31:02 +08:00
Donal Lafferty e958f22ff3 CIFS support for secondary storage is documented here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/CIFS+Support
It was implemented by extending the NFS provider. Its validation was updated so that you can pass it a URL containing the
details of a CIFS share.  The code that mounts NFS shares was extended to allow it do the same for CIFS shares.  Otherwise,
the secondary storage code is left unchanged.
2013-09-11 14:23:29 +05:30
Min Chen b11a8e12e8 CLOUDSTACK-4625:Snapshots and templates should be deleted from staging
storage after create template from snapshot on S3.
2013-09-06 17:48:40 -07:00
Min Chen bf83efcf4b CLOUDSTACK-4190:[Object_store_refactor] volume should be deleted from
staging storage after successfule volume migration, specially handle
DeleteVolume command for Vmware volume structure in secondary storage.
2013-09-06 14:39:03 -07:00
Sanjay Tripathi 7bff499bd3 CLOUDSTACK-4434: EN: Ubuntu: Direct input "- _ ", "? /", "keyboard /" ,"keyboard -" keys are not working well for the US keyboard. 2013-09-05 13:05:21 +05:30
Min Chen 49dd7289c0 CLOUDSTACK-4468:template created from snapshot is destroyed once we
restart management server.
2013-08-26 11:58:53 -07:00
Wido den Hollander a5c10767d6 CLOUDSTACK-4249: Do not assume KVM snapshots are in QCOW2 format
RBD snapshots are in RAW format and are stored as such on Secondary Storage.

When creating a template from such a snapshot, honor the image format passed
down by the management server and act on that.

The old code simply assumed it always was QCOW2.
2013-08-21 17:12:30 +02:00
Edison Su 45b35aaeef CLOUDSTACK-4398: get physical size of template if the template is stored in S3 2013-08-19 17:52:28 -07:00
Min Chen c675f826e5 CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied
to Staging storage during snapshot creation.
2013-08-14 18:12:53 -07:00