etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,121 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

21121 Commits

Author SHA1 Message Date
Min Chen 5ec2a44ce9 Rebase with latest master. 2013-10-28 20:51:34 -07:00
Sheng Yang 271a7dff9e Fix VPC issue due to VpcVirtualNetworkApplianceManagerImpl.java is not registered 
It should be registered rather than VirtualNetworkApplianceManageImpl.java,
since it would cover the isolated network case as well.
 2013-10-28 17:55:51 -07:00
Edison Su 89d6e7ed66 CLOUDSTACK-4817: fix s3 multipart uplaod 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
 2013-10-28 17:31:49 -07:00
Min Chen afcf09edaa Various bug fixes for object store migration. 2013-10-28 17:23:59 -07:00
Alena Prokharchyk 2cac1aaa0f Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud) 2013-10-28 15:03:57 -07:00
Alena Prokharchyk 5caeab782d ResourceDetails - 
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
 2013-10-28 14:45:52 -07:00
Brian Federle 9b1cfa41eb Style toolbar, tables 2013-10-28 13:56:12 -07:00
Brian Federle ee1c83e689 Style toolbar 2013-10-28 13:50:21 -07:00
Alena Prokharchyk e86b612750 ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects 2013-10-28 12:53:53 -07:00
Alena Prokharchyk d0090a0c24 Resource details (metadata) - added support for Storage pool details 2013-10-28 12:53:53 -07:00
Edison Su 92f97248a8 fix inject hypervisorHelperImpl 2013-10-28 12:09:14 -07:00
Brian Federle f92f7b5c5d Fix panel dimensions and colors 2013-10-28 11:57:50 -07:00
Brian Federle bd697c53d8 Style detail view 2013-10-28 11:47:18 -07:00
Brian Federle 6748d19dbc Fix z-index of header bar causing overlap w/ dialogs 2013-10-28 11:47:18 -07:00
Sheng Yang 10d47147a6 Remove the old duplicate savepassword.sh 
The working one is at: systemvm/patches/debian/config/opt/cloud/bin/
 2013-10-28 11:37:25 -07:00
Brian Federle d5777c8e33 Style nav bar & body BG 2013-10-28 11:34:43 -07:00
Brian Federle e9dcdc0411 Style header bar 2013-10-28 11:12:57 -07:00
Toshiaki Hatano 3e70b145c4 CLOUDSTACK-4967: vxlan doesn't scale 
- Fix inproper multicast address creation (when VNI > 65535)
- Fix missing bride name in delete oparation

Signed-off-by : Toshiaki Hatano <haeena@haeena.net>
 2013-10-29 02:38:02 +09:00
Likitha Shetty 7116268f33 CLOUDSTACK-4946. VM Restore with template id/Volatile VM feature doesnt work on VMware 
When a ROOT volume is created from base template, if a folder already exists for the ROOT volume's VM then replace the old ROOT disk files with the new one.
 2013-10-28 13:17:54 +05:30
Santhosh Edukulla 03830c570e Adding few changes and cleaning up the code 
- Added few common naming conventions
- Cleanedup code
- Added a simple utility function

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
 2013-10-28 12:49:41 +05:30
Girish Shilamkar c8b91f1b72 CLOUDSTACK-4686: Fixed volume limit for domain 2013-10-28 11:36:20 +05:30
Santhosh Edukulla b4ceefa469 Adding readable start and end time stamps 
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
 2013-10-28 11:29:27 +05:30
Prasanna Santhanam f4fb5f5582 spring-modularization: remove simulator planner 
The simulator uses the default planners of cloudstack and does not
require a separate planner context (as of now). This was just c&p from
baremetal planners.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-10-28 11:29:01 +05:30
Mike Tutkowski 858ce76665 Extend support of CloudStack-managed storage to KVM 2013-10-27 22:30:03 -06:00
Laszlo Hornyak 11441a3672 License header added to PropertiesStorageTest 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 18:39:00 +02:00
Laszlo Hornyak c72f65dc17 Remove test dependency on mysql driver 
The dependency is no longer needed.
 2013-10-26 17:47:35 +02:00
Laszlo Hornyak fa35490fef InputStream use fix in ProcessUtil 
- use PropertiesUtil to load Properties from file

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:47:34 +02:00
Laszlo Hornyak dbaa818d1e InputStream use fix 
Closes the FileInputStream opened at configuration in
- ClusterManagerImpl
- ClusterServiceServletAdapter
- TransactionLegacy
- AsyncJobManagerImpl
- DBEncryptionUtil
- EncryptionSecretKeyChecker

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:47:34 +02:00
Laszlo Hornyak c17831532e InputStream use fix in LibvirtComputingResource 
- Properties object polulation using PropertiesUtil.loadFromFile

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:47:34 +02:00
Laszlo Hornyak 58477834b6 InputStream use fix in PropertiesUtil 
- use PropertiesUtil.loadFromFile to read the properties
- test added

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:47:34 +02:00
Laszlo Hornyak 5e1ea1a3e4 InputStream use fix in PorpoertiesStorage 
- Properties object polulation using PropertiesUtil.loadFromFile
- test added
- the separate FileNotFoundException handling block was removed as the next IOException block is catching it and it is only logging

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:47:33 +02:00
Laszlo Hornyak 7902315287 build fix 
Failing VMSnapshotStrategyTest was missing db.properties

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:34:00 +02:00
Min Chen 216d0343ed Forgot to update store role of template_store_ref and snapshot_store_ref 
in prepareSecondaryStorageForMigrationCmd.
 2013-10-25 22:46:07 -07:00
Min Chen 0f0370b9ab Add back initialization of _maxVolumeSizeInGb in VolumeApiServiceImpl. 2013-10-25 21:46:03 -07:00
Min Chen 2c0534794e CLOUDSTACK-4816: Removed unused field from S3TO to avoid confusion in 
the log.
 2013-10-25 21:45:45 -07:00
Min Chen 694ec684a3 Add back initialization of _maxVolumeSizeInGb in VolumeApiServiceImpl. 2013-10-25 21:24:08 -07:00
Min Chen 28f9952c6e CLOUDSTACK-4816: Removed unused field from S3TO to avoid confusion in 
the log.
 2013-10-25 21:20:09 -07:00
Min Chen 9da56fe1fe Remove wrong final modifier from Created field in SnapshotDataStoreVO, 
TemplateDataStoreVO and VolumeDataStoreVO.
 2013-10-25 21:15:36 -07:00
Edison Su 465c9ec5c3 Merge remote-tracking branch 'origin/master' 2013-10-25 18:24:29 -07:00
Edison Su 70b2c0150d rebase to spring changes 2013-10-25 18:15:36 -07:00
Jessica Wang 718bc37dc0 CLOUDSTACK-4128: UI > Infrastructure > Secondary Storage > Create Secondary Storage > Provider S3 > make "Create NFS Secondary Staging Store" checked and non-editable. 2013-10-25 16:47:52 -07:00
Edison Su 51a8086cf6 Merge branch 'pluggable_vm_snapshot' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/resources/storageContext.xml
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
 2013-10-25 16:47:17 -07:00
Darren Shepherd 9f7b4884a7 Make commands.properties optional for non-ACS code 
Currently any new API extension to CloudStack must edit
commands.properties to add the appropriate ACLs.  This generally works
fine for ACS as we control the contents of that file and distribute
all the code ourself.  The hang up comes when somebody develops code
outside of ACS and want to add their code to an existing ACS
installation.  The Spring work that has been done has made this much
easier, but you are still required to manually edit
commands.properties.  This change introduces the following logic.

First check commands.properties for ACL info.  If ACL info exists, use
that to authorize the command.  If no ACL information exists (ie
null), then look at the @APICommand annotation.  The defaults of
@APICommand will provide no ACL info.  If the @APICommand annotation
provides no ACL info, use that.
 2013-10-25 16:31:55 -07:00
Darren Shepherd ad74948480 Move LockMasterListener initialization to system context 
This reverts commit d178b25daa and moves
the initialization to the system context, which really where it should have
been from the beginning.
 2013-10-25 15:11:47 -07:00
Edison Su a6ce66e55a move a lot of code into vmsnapshot strategy 
fix compile

fix compile

add vm_snapshot_details table in db

add vmsnapshot test cases
 2013-10-25 15:09:04 -07:00
Laszlo Hornyak 56f1277339 fix master build 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-25 23:54:10 +02:00
Alena Prokharchyk 300f626d42 Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase 2013-10-25 14:21:20 -07:00
Jessica Wang ad51b8edfb CLOUDSTACK-4966: UI: (1) detailView widget: extend detailView widget to support destroy action that will close detailView and remove item from listView when toRemove parameter is passed. 
(2)Destroy Instance action: add expunge option for root-admin and domain-admin. When expunge is set to true, instance will be expunged right after destroyed.
 2013-10-25 13:48:50 -07:00
Alena Prokharchyk aa9f8e64ae Resource details: added way of generic access of resource DAO based on the resourceType passed in (was hardcoded before) 2013-10-25 11:57:17 -07:00
Alena Prokharchyk 0fb4d9d5a2 Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors. 2013-10-25 10:56:19 -07:00