21077 Commits

Author SHA1 Message Date
Min Chen
28f9952c6e CLOUDSTACK-4816: Removed unused field from S3TO to avoid confusion in
the log.
2013-10-25 21:20:09 -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 d178b25daa484dda44bb34e63cb719d1c3cc1519 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
Koushik Das
8e62fb7998 CLOUDSTACK-4964: Cisco VNMC: Nexus password gets logged in MS logs during guest n/w implementation with VNMC provider
Suppressing the password from getting logged
2013-10-25 17:58:15 +05:30
Bharat Kumar
e4a1ff818f CLOUDSTACK-4947 VM creation fails if the global config apply.allocation.algorithm.to.pods is set to true." 2013-10-25 15:07:00 +05:30
SrikanteswaraRao Talluri
da7d2fe4f3 CLOUDSTACK-4691: Deleted host maintenance tests from this file 2013-10-25 14:47:11 +05:30
sanjeevneelarapu
2103068816 CLOUDSTACK-702: Added tests for alias ip verifications on VR 1. Moved vm deployment code to setup and vm deletion code teadDown methods 2. Added two tests which would verify alias removal after last vm expunge in CIDR and alias status after VR reboot
CLOUDSTACK-702: Test for verifying ip alias after VR stop start
     1.Deploy vm in new cidr which will create ip alias on existing VR
	Stop,start VR and verify ip alias

Conflicts:

	test/integration/component/maint/test_multiple_ip_ranges.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2013-10-25 14:29:19 +05:30
Darren Shepherd
a77435dab5 Add missing extensible type registries
The following types were not setup to discover extensions

com.cloud.network.element.FirewallServiceProvider
com.cloud.network.element.PortForwardingServiceProvider
com.cloud.network.element.StaticNatServiceProvider
com.cloud.network.element.NetworkACLServiceProvider
com.cloud.network.element.LoadBalancingServiceProvider
com.cloud.network.element.Site2SiteVpnServiceProvider
2013-10-24 20:20:55 -07:00
Sheng Yang
f650d07b6f CLOUDSTACK-4913: Don't enable ebtables/iptables for non-security group zone 2013-10-24 18:48:52 -07:00
Sheng Yang
df1924d910 CLOUDSTACK-754: Fix KVM and Vmware resource for VPN 2013-10-24 17:43:03 -07:00
Sheng Yang
1528725949 CLOUDSTACK-754: Enable Remote Access VPN for VPC
With integration smoke test case.
2013-10-24 17:34:41 -07:00
Brian Federle
d63a08d0a3 Add bg gradient to header 2013-10-24 16:04:51 -07:00
Alena Prokharchyk
24725f8e21 ResourceDetails:
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
Brian Federle
3734af1402 Quickview: Better styling 2013-10-24 15:52:54 -07:00
Brian Federle
f185eac4b5 Quickview: Fix positioning 2013-10-24 15:52:54 -07:00
Brian Federle
1b7f5106b6 Detail view UI: make view all links have hyperlink style 2013-10-24 15:52:54 -07:00
Brian Federle
71a38b74c3 Browser widget: Modify behavior
-For better screen real-estate, make all
 browser panes open to full width of content area by default, unless
 partial: true is passed in options

-Remove animation effect, for quicker browsing
2013-10-24 15:52:54 -07:00
Brian Federle
2dd5e2d7c7 Make header width 100%; body stays 1024px centered. 2013-10-24 15:52:54 -07:00
Darren Shepherd
d178b25daa Move LockMasterListener initialization to earlier in the code
This is not perfect fix but should address 99% of the issues.  The only
time an issue could happen is if something in the bootstrap or system
context tried to lock a row.  Which shouldn't happen at the moment.  If
we find that to be an issue, the LockMasterListener could move to system
context and be inject here.
2013-10-24 15:35:21 -07:00
Brian Federle
0ef8b8770a Update logo 2013-10-24 15:22:02 -07:00
Jessica Wang
6df1998645 UI > Edit Template, Edit ISO > can't update template/ISO in only one zone. It always get updated in all zones. 2013-10-24 14:58:23 -07:00
Jessica Wang
259245200d CLOUDSTACK-4649: UI > Edit Instance, Edit Template > fix a bug that XenServer Tools Version 6.1+ field didn't get updated correctly. 2013-10-24 14:25:21 -07:00
Kelven Yang
ed0fbcc81c CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance 2013-10-24 11:42:41 -07:00
Jessica Wang
a1be4fffe5 UI > Instance Wizard > Step 4 > correct label from "Data Disk Offering" to "Disk Offering" since selected disk offering here refers to root disk volume when selected template is of ISO format, data disk volume otherwise. 2013-10-24 11:29:47 -07:00
Brian Federle
c5fdf2935c Network details: remove font tag from field value
Embedded HTML is not supported in detail view results,
so remove embedded font tag to prevent the tag characters from being displayed.
2013-10-24 10:53:05 -07:00
Alena Prokharchyk
765832a5cf CLOUDSTACK-4649: added support to removeResourceDetail to remove details for UserVm/Templates
Conflicts:
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-24 10:34:21 -07:00
Abhinandan Prateek
499a8c0915 syncing 64 bit svm scripts 2013-10-24 18:52:13 +05:30
Wei Zhou
059e3beb28 CLOUDSTACK-4505: add ExpungeVM command to expunge a destroyed VM on demand 2013-10-24 11:52:00 +02:00
Wei Zhou
7cdd2ef6ba add iptables/ethtool requirement on Agent in debian/control 2013-10-24 11:33:49 +02:00
Santhosh Edukulla
0780604503 CLOUDSTACK-4885: basic timing profiler for tests
This will add time taken in seconds along with start and end timestamp
logging facility for test cases.Currently this is not
available for console logs

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2013-10-24 14:52:53 +05:30
Darren Shepherd
c25b58356b Revert "Revert change to ManagedContextTimerTask to unblock DB upgrade"
This reverts commit 2799ee3d4fb86f6db856985879a41e5dfc63ccc6.
2013-10-23 23:41:00 -07:00
Darren Shepherd
63e46ad1d0 Make system CallContext load user on demand
Before every thread would hit the database once at the start to
load the system account and user.  The loaded objects are almost never
used.  This change optimizes the behavior and lazy loads the system
user and account object.
2013-10-23 23:09:58 -07:00
Darren Shepherd
8f25ea8c0f Removing spring context files from debian build 2013-10-23 19:41:29 -07:00
Alena Prokharchyk
2bb716efd8 ResourceMetaData (Resource details) fixes:
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -07:00
Alena Prokharchyk
e52e7a5634 CLOUDSTACK-4874: rever the previous commits. Service offering details are already being returned in "serviceofferingdetails" field of the service offering response 2013-10-23 17:17:14 -07:00
Darren Shepherd
f3e968b983 Update StorageStrategyFactory to not sort, but just iterate and find the first 2013-10-23 16:36:31 -07:00
Anthony Xu
b747549597 CLOUDSTACK-4649:
get VM details from DB

Anthony
2013-10-23 16:02:44 -07:00
Anthony Xu
7120c1eb97 fixed NPE 2013-10-23 15:26:20 -07:00
Darren Shepherd
891b85d516 Add missing licenses 2013-10-23 15:20:08 -07:00
Koushik Das
d1bddede46 CLOUDSTACK-243: On management server, security for remote JMX connections is disabled Disabled JMX connections for both local and remote
Signed-off-by: Koushik Das <koushik@apache.org>
Signed-off-by: John Kinsella <jlk@stratosec.co>
2013-10-23 15:15:02 -07:00