21308 Commits

Author SHA1 Message Date
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
Darren Shepherd
b134692697 Fix compilation errors in engine/storage/integration-test 2013-10-23 14:44:16 -07:00
John Kinsella
13362aee69 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-10-23 14:13:26 -07:00
John Kinsella
45e4d4fc3b Summary: Updated sudoers approved commands for cloud user
Detail: Previously the cloud user has full password-less sudo access.
This commit changes that to only allow access to a specific list of
commands. Been tested in production on ACS 4.0 and 4.2 mangement servers.

BUG-ID: CLOUDSTACK-967
Bugfix-for:
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella <jlk@stratosec.co> 1382560936 -0700
2013-10-23 13:42:16 -07:00
Jessica Wang
9f38614eb8 CLOUDSTACK-999: UI > Register Template > when hypervisor is selected as "Hyperv", format dropdown will have "VHD" option. 2013-10-23 13:18:18 -07:00
Jessica Wang
5133812c85 CLOUDSTACK-4649: UI > (1) detailView widget: pass $detailView property in action.action({}).
(2) Edit Template action: make 'XenServer Tools Version 6.1+' field editable and use addResourceDetail API to update it.
(3) Edit Instance action: make 'XenServer Tools Version 6.1+' field editable and use addResourceDetail API to update it.
2013-10-23 12:51:08 -07:00
Jessica Wang
c3ddd3bf00 CLOUDSTACK-4649: UI > (1) Register Template dialog: add 'XenServer Tools Version 6.1+' checkbox.
(2) Template detailView: add 'XenServer Tools Version 6.1+' field.
(3) Instance detailView: add 'XenServer Tools Version 6.1+' field.
2013-10-23 12:50:42 -07:00
Darren Shepherd
c9101966e0 Added StorageStrategyFactory to centralize and deduplicate some logic 2013-10-23 12:40:41 -07:00
Darren Shepherd
81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -07:00
Chris Suich
0ed7ebd7e7 Squashed & merged commit of the following:
commit c9ee0d12e191e803fb341f3f96e95ca434a36f6c
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Wed Oct 23 16:55:10 2013 +0200

    CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
    (cherry picked from commit a94acc5a43aeaf5f18f1912e2653a92f6041a6e5)

commit fe1586c71377bc6d219db2dcf088c40b65dd1fc4
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Tue Oct 22 11:20:27 2013 -0700

    CLOUDSTACK-4649:
            vm sync tracks the pv driver version for xenserver

     Anthony

commit 56a218f66eda540b4b4b04030ee71fc6863f8532
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Mon Oct 21 16:10:07 2013 -0700

    CLOUDSTACK-4649:
        xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
    this patch tracks PV driver versions in vm details and template details.

    Anthony

commit 4e85d28c678a6f96b5b70d8d33fc60f9d1ea3df6
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Date:   Mon Oct 21 21:17:33 2013 +0200

    removed unused static field

    - s_httpClientManager was not used

    Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>

commit d4121fa26023db236f7396cea455ef090672ae9a
Author: Chris Suich <chris.suich@netapp.com>
Date:   Tue Oct 22 10:45:22 2013 -0400

    Updated DataMotionServiceImpl and ApiResponseHelper based on review feedback.

commit aaf026e1e4204d405bcda2ae4f1a01b1d0f7e7cb
Author: Chris Suich <chris.suich@netapp.com>
Date:   Thu Oct 17 14:27:12 2013 -0400

    Added context to strategy sorting error responses
    Added TODOs for DRYing out pickStrategy() overloading

commit a221f4aa3fb2ddc255bc35cf753f98f88f5bf44e
Author: Chris Suich <chris.suich@netapp.com>
Date:   Wed Oct 16 09:57:28 2013 -0400

    Updated inefficient strategy sorting/selection
    Removed unnecessary canRevertSnapshot from PrimaryDataStoreDriver
    Other general cleaup and fixes from reviews

commit 7d58949c6a1b7e853e891b59387a9620e8cd7a91
Author: Chris Suich <chris.suich@netapp.com>
Date:   Mon Oct 14 14:01:22 2013 -0400

    Added volume snapshot revert capability to SnapshotResponse
    Updated UI to hide/show snapshot revert action per snapshot

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-23 12:21:43 -07:00
Laszlo Hornyak
4b530c874f Safe properties loader
- new utility method introduced in PropertiesUtil to load properties objects from files
- RegionManagerImpl modified to use the utility method
- Tests added for both

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-23 20:50:00 +02:00
Laszlo Hornyak
b4e972da03 Integer instantation removed
Two Integer object was created for each comparison, just in order to compare the two values.
This is replaced with Integer.compare()

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-23 20:50:00 +02:00
Jessica Wang
7edb4d377f CLOUDSTACK-4024: UI > (1) detailView widget - add action handler for prepareObjectStoreMigration.
(2) Infrastructure > Secondary Storage > add new action prepareObjectStoreMigration and show it when provider is NFS.
2013-10-23 11:46:42 -07:00
Darren Shepherd
df728fcf41 Include new DAO added since spring-modularization branch 2013-10-23 11:23:52 -07:00
Darren Shepherd
76c22eae5b Update to use new Transaction API 2013-10-23 11:23:18 -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
Darren Shepherd
80509f9ba2 Update to new Transaction API 2013-10-23 11:03:47 -07:00
Darren Shepherd
205a77a5bb Merge remote-tracking branch 'origin/txn-refactor'
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00