23325 Commits

Author SHA1 Message Date
Brian Federle
1ad532f57e CLOUDSTACK-6438: WIP: If VM has additional IPs, keep showing in add screen 2014-05-01 15:40:47 -07:00
Wido den Hollander
3962577329 CLOUDSTACK-4549: Do not force RBD snapshot backups to RAW format
Since we use qemu-img to copy from RBD to Secondary Storage we no
longer have to force to RAW images, but can stick with QCOW2

When the snapshot backups are QCOW2 format they can easily be deployed
again when restoring from a backup
2014-05-01 21:03:11 +02:00
Wido den Hollander
c1116142a3 kvm: Better handle different volume formats when creating a volume
The KVMStorageProcessor no longer has a hardcoded if-statement which sets
RBD volumes to RAW, this is now handled in the LibvirtStorageAdapter

The Management Server still sends QCOW2 as format. That's a fix for later.
2014-05-01 21:03:11 +02:00
Anthony Xu
b3491bcbac removed unused command ClusterSyncCommand 2014-05-01 11:45:19 -07:00
Sachchidanand Vaidya
537536835b - Created new devcloud advanced networking config file (devcloud-advanced_juniper-contrail.cfg). - Modification to deployDataCenter script, to enable "JuniperContrailRouter" & "JuniperContrailVpcRouter" providers.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-05-01 13:10:12 +02:00
Daan Hoogland
53ee9ae28e CLOUDSTACK-6549: ommission due to insufficient tests in CLOUDSTACK-6231 2014-05-01 09:41:06 +02:00
Amogh Vasekar
ac4f940c9d Remove accidentally added columns while resolving merge conflicts
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
2014-04-30 15:43:21 -07:00
SrikanteswaraRao Talluri
91d7d2b51e Fixed test data object retrieval 2014-04-30 19:51:21 +05:30
Santhosh Edukulla
01b04cd7ac Fix few issues seen in run.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2014-04-30 19:27:20 +05:30
SrikanteswaraRao Talluri
9ed6563e7a Fixes for BVT and Regression run failures against 4.4 CS 2014-04-30 19:25:53 +05:30
SrikanteswaraRao Talluri
b273f66423 CLOUDSTACK-5674:Fixes for BVT and Regression test failures.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	test/integration/smoke/test_nic.py
2014-04-30 19:25:35 +05:30
Daan Hoogland
6b0c34faee CLOUDSTACK-6231: network acl item cidrs loaded from a seperate table
Conflicts:
	setup/db/db/schema-430to440.sql
2014-04-30 15:39:00 +02:00
SrikanteswaraRao Talluri
4efe933818 removed basic zone tag and added advanced zone tag 2014-04-30 14:00:18 +05:30
Santhosh Edukulla
6c9b21907c Added fix for CLOUDSTACK-6389
Added changes for CLOUDSTACK-6389.
More details in the bug.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-30 13:56:52 +05:30
Santhosh Edukulla
bf54f74ffc Fix few issues seen in run.
Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
2014-04-30 13:56:34 +05:30
Laszlo Hornyak
94ab870d42 null pointer dereference fix
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-29 21:46:16 +02:00
Anthony Xu
282c9da68e disable XS event 2014-04-29 11:34:00 -07:00
root
56a44151aa Fixed pep8 issues arising as part of merge
Fixed pep8 issues arising as part of merge

Signed-off-by: root <root@localhost.localdomain>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-29 19:36:09 +05:30
Rajesh Battala
4bc9f74b2d Removed Epoch tag/number from the cloud.spec to fix the rpm installation of Management Server, Agent and awsapi 2014-04-29 17:14:49 +05:30
Rajani Karuturi
f4779b4d0c Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account
Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java

Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-29 14:49:06 +05:30
Damodar Reddy
29b4fe6d9f CLOUDSTACK-6271: The cloud-setup-databases was failing when your jasypt jar path has spaces in it's path 2014-04-29 14:44:03 +05:30
Koushik Das
8d92d00c87 CLOUDSTACK-4371: [Performance Testing] Basic zone with 20K Hosts, management server restart leaves the hosts in disconnected state for very long time
Fixed simulator code to handle local storage during host reconnect
2014-04-29 11:11:25 +05:30
Mike Tutkowski
cbf0a559af CLOUDSTACK-6170 Needed to add logic for XS 6.2 + XS62ESP1 + XS62ESP1004 2014-04-28 23:32:17 -06:00
Nitin Mehta
dd55095fd5 CLOUDSTACK-6530: Populate the first class entities in the context to be available for publishing more information for the event bus, checking the displayable property etc.
(cherry picked from commit 3e7ea4e8d99a92872007f11a09ab87c8ba61e1da)
2014-04-28 18:21:48 -07:00
Laszlo Hornyak
fc68922286 Static resource compression
- added compile time maven plugin to compress css and js files
- Added new StaticResourceServlet to serve the requests to static files, this replaces the tomcat DefaultServlet
- Tests
- mapping of the static resource servlet to css and js files

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-28 21:10:18 +02:00
Laszlo Hornyak
ecec8d368d autounboxing fix in ConfigurationManager
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-04-28 20:56:45 +02:00
Min Chen
44ff7fea5f CLOUDSTACK-6513: IAM - Templates - When templates are listed with
templatefilter="shared" is used , we see public templates also being
included in the list. This commit reverts listTemplates behavior to 4.3
old logic without using consistent interpretation of list parameters
adopted in new IAM model.
2014-04-28 11:11:53 -07:00
Min Chen
3e4151e13e CLOUDSTACK-6512:IAM - Not able to list shared networks in the Vm
deployment flow. This commit is to revert
ec5ee761d98c67c7da2ea70b623d4a9f3da966b5 to still use old logic for
listNetworks to keep old behavior instead of new IAM model.
2014-04-28 11:11:42 -07:00
Min Chen
96af7396b6 CLOUDSTACK-6502:IAMGroup.list and IAMPolicy.list in marvin base.py are
not working.
2014-04-28 11:11:35 -07:00
Min Chen
6af1a2919b CLOUDSTACK-6501:IAM - DomainAdmin - When listVirtualMachines is used
with listall=true and account and domainId , Vms owned by the account
account is not listed.
2014-04-28 11:11:27 -07:00
Prachi Damle
9514c9e045 CLOUDSTACK-6349: IAM - No error message presented to the user , when
invalid password is provided.

- AccountManager now works using accountId instead of accountType in
following methods too:
- isResourceDomainAdmin()
- isAdmin()
2014-04-28 11:10:50 -07:00
Prachi Damle
797169457b CLOUDSTACK-6349: IAM - No error message presented to the user , when invalid password is provided.
- AccountManager now works using accountId instead of accountType
2014-04-28 11:09:12 -07:00
Daan Hoogland
ca907d8d02 formatting 2014-04-28 15:50:05 +02:00
Daan Hoogland
3bd594c584 CLOUDSTACK-6485: private gateway network should not be associated with vpc
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-04-28 14:40:52 +02:00
Damodar Reddy
881792991e CLOUDSTACK-6271:[Windows] Integrating setup databases with msi installer for windows
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-04-28 16:46:26 +05:30
Sanjay Tripathi
795a6e5fa0 CLOUDSTACK-6480: Creating Service Offering with Implict Dedication planner
fails with message:  "Please specify the pciDevice and vgpuType correctly".
2014-04-28 11:27:47 +05:30
Sanjay Tripathi
c36d221a30 Fix log messages for vgpu creation. 2014-04-26 17:28:27 +05:30
Amogh Vasekar
05802004e2 In 4.3, SSL was turned off by default.
However, for SSVM, the value from configuration server overrides the default in Config.java. Work around is to change in global properties.

Local testing, checking a fresh install has the above property false by default.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2014-04-25 14:48:36 -07:00
Sebastien Goasguen
744e2a54e8 Review from pyr https://reviews.apache.org/r/20557/ 2014-04-25 16:59:47 -04:00
Amogh Vasekar
78c683f568 CLOUDSTACK-6437:
Add ability to distinguish between user defined and system defined guest OS and mappings
Add default mappings for XenServer

Local testing with
1. Add new guest OS by API
2. Add new guest OS mapping by API
2014-04-25 13:10:10 -07:00
Mike Tutkowski
2960ba733a CLOUDSTACK-6170 Updated logic to more accurately calculate how much space is currently allocated for a managed storage pool 2014-04-25 12:31:13 -06:00
Mike Tutkowski
06bbcde458 Organized an algorithm a bit more 2014-04-25 11:57:54 -06:00
SrikanteswaraRao Talluri
e9fb906599 CLOUDSTACK-6511: fixed for bvt and component test failures 2014-04-25 18:13:47 +05:30
Murali Reddy
bf188fc13b CLOUDSTACK-6431: OVS migrating vm to a new host added to the cluster
does not create gre tunnel port on the new host

ensure OveElement gets a chance to setup tunnel network on the host
before VM is migrated.
2014-04-25 17:22:21 +05:30
Sanjay Tripathi
cf4db845ff CLOUDSTACK-6452: Failed to Live Migrate VM across clusters with Xenserver 6.2.5. 2014-04-25 16:39:40 +05:30
Murali Reddy
42b5e1858c incorporate change in getGuestNicModel signature, while handling OVS in
OvsVifDriver
2014-04-25 15:41:02 +05:30
Murali Reddy
213a68dc39 CLOUDSTACK-6507: ensure sequence numbers are honoured while processing
OvsVpcPhysicalTopologyConfigCommand and OvsVpcRoutingPolicyConfigCommand

fix ensures only latest updates are applied (new openflow rules) to the
bidge enabled for distributed routing.
2014-04-25 15:02:19 +05:30
Murali Reddy
8e4391bff3 CLOUDSTACK-6505: XenServer bridge for the OVS tunnel network gets reset
on the hosts in the xenserver cluster

this fix ensures that brige is created only once so that openflow rules
configured on the bridge are not lost.
2014-04-25 15:02:18 +05:30
Murali Reddy
771abe4286 fix KVM plug-in for OVS tunnel network. Fix addreses two issues.
fix  mismatch of ovs-host-setup, ovs_host_setup used Libvirt resource and
scripts

plug the nic to OVS bridges created for the tunnel network.

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
2014-04-25 15:02:17 +05:30
Murali Reddy
095151c98a add support for sequence numner in the VPC topology updates and VPC
routing policy updates

Conflicts:
	setup/db/db/schema-430to440.sql
2014-04-25 15:02:17 +05:30