Commit Graph

22472 Commits

Author SHA1 Message Date
Daniel Vega c2f367982e CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c919ff83d8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2014-11-25 14:19:16 +05:30
Edison Su a62fa62fc6 CLOUDSTACK-7966:
remove snapshot_store_ref entry, in which role is Primary, during
storage GC

(cherry picked from commit 7175247c5e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 14:14:31 +05:30
Rohit Yadav 6d31aca25c CLOUDSTACK-6075: Increase the ram size for router service offering
Increased the ram size of Internal load balancer vm service offering also
Backported from fix by Harikrishna Patnala <harikrishna.patnala@citrix.com>
https://reviews.apache.org/r/17941/

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-25 14:08:25 +05:30
Kelven Yang 2aa9bb6896 CLOUDSTACK-6743: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a tight loop to spin
(cherry picked from commit 09ec127470)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
	framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
2014-11-25 00:03:40 +05:30
Rohit Yadav 15ded4fdda CHANGES: add backported commits on 4.3 branch since 4.3.1 release
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:54:18 +05:30
Mike Tutkowski a165309b89 Allow infrastructure to handle delete of volume from DB
(cherry picked from commit 6602ad71ac97fb1875131f41bb5f92ff1e3a1c7b)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:05 +05:30
Rohit Yadav 11d446a0d8 Fix build failure from cherry-picked commits
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:04 +05:30
Olivier Lemasle ed90e0c751 CLOUDSTACK-6669: Fix support resize in usage server
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit 303e6ffc1e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	usage/src/com/cloud/usage/parser/VolumeUsageParser.java
2014-11-24 23:47:04 +05:30
Rajani Karuturi 06a664b063 FIXED CLOUDSTACK-6669 Support volume resize in usage server
(cherry picked from commit bdde5335f9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	usage/src/com/cloud/usage/UsageManagerImpl.java
2014-11-24 23:47:04 +05:30
Harikrishna Patnala 90c92ff17d CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2
(cherry picked from commit 14f1b96b51)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:03 +05:30
Kelven Yang 839ef94ce9 CLOUDSTACK-6970: Protect event interpretion from causing NPE exception
(cherry picked from commit 06d8d3a03f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 23:47:03 +05:30
Kelven Yang b716444b84 Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server.
(cherry picked from commit 521ac796dd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServer.java
2014-11-24 21:13:14 +05:30
Min Chen 4e3ac55a0e CLOUDSTACK-6859:Management Server PermGen run out of memory after some
time due to class leak.

(cherry picked from commit 25580c7cd1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java
2014-11-24 21:13:14 +05:30
Harikrishna Patnala 122332b326 CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit 5d389b1a71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java
2014-11-24 21:13:14 +05:30
Harikrishna Patnala e25690ca83 CLOUDSTACK-6463: password is not set for VMs created from password enabled template
(cherry picked from commit 2284a95e4f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 21:13:13 +05:30
Kelven Yang 421137d9f6 NDC.pop() can return empty string, this causes a loop spinning in CallContext.UnregisterAll().
(cherry picked from commit cdf605b2cd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 21:13:13 +05:30
Kelven Yang e4a3ee1526 CLOUDSTACK-6647: appending instance name with custom supplied info that contains - character can break vmsync.
(cherry picked from commit 98307bfcea)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/com/cloud/vm/VirtualMachineName.java
2014-11-24 21:13:13 +05:30
Rohit Yadav cef29cc818 appliance: use 4.3 git snapshot to configure services
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-24 12:12:01 +05:30
Ian Duffy 879f94c743 modify travis file to force true on test execution. The XML parser will determine failures 2014-11-23 04:45:03 +00:00
Rohit Yadav df9fe7817c travis: run jetty using IPv4 stack only
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-21 20:02:21 +05:30
Min Chen eaaac81870 CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying
all the tags of all resources.

(cherry picked from commit 5fa7801b20)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-21 18:52:28 +05:30
Sujaya Maiyya 5563a7314e fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler.
(cherry picked from commit e07d0ddabf)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
2014-11-21 18:45:53 +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
Likitha Shetty 59ce63918e CLOUDSTACK-7415. Host remains in Alert after vCenter restart.
Management server PingTask should update PingMap entry for an agent only if it is already present in the Management Server's PingMap.

(cherry picked from commit 8ce6eba549)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-21 16:20:48 +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 57f28f1085 appliance: change CLOUDSTACK version to match 4.3.1 for building systemvmtemplate
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-20 20:18:44 +05:30
Wido den Hollander 5cd0d25812 CLOUDSTACK-3383: Fetch CPU utilization more reliable.
This should fix that we can't gather CPU statistics on hypervisors
> Ubuntu 12.04

(cherry picked from commit 69ee01af9d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2014-11-20 19:41:53 +05:30
Syed 56d8b173a0 CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)
Signed-off-by: Will Stevens <wstevens@cloudops.com>
(cherry picked from commit 8ea7902075)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-20 19:38:47 +05:30
Will Stevens 9258b8350e CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
(cherry picked from commit 92d4a41a69)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/root_chain.crt
	server/test/resources/certs/root_chain.key
	server/test/resources/certs/rsa_ca_signed2.crt

(cherry picked from commit 9c0c4f713f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
	server/test/resources/certs/rsa_ca_signed.crt
	server/test/resources/certs/rsa_ca_signed.key
	server/test/resources/certs/rsa_self_signed.crt
	server/test/resources/certs/rsa_self_signed.key
	server/test/resources/certs/rsa_self_signed_with_pwd.crt
	server/test/resources/certs/rsa_self_signed_with_pwd.key
2014-11-20 19:33:16 +05:30
Rajani Karuturi 09a3eefba7 Fixed CLOUDSTACK-7937 CloudStack accepts unauthenticated LDAP binds
added validation checks for empty username and password and debug logs
when that happens.

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-20 12:13:02 +01:00
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
Anshul Gangwar 14e048dada CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. If we create VM with shared service offering and attach disk with local disk offering, and one of storage pool is full(cannot be allocated) and other is not full then we are not putting the cluster in avoid list which is causing this infinite loop.
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-11-19 12:21:02 +01:00
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
Milamber e615f218a9 Update L10N strings from Transifex to repo (4.3 branch) 2014-11-15 08:59:10 +00:00
Likitha Shetty e2fd4ef42c CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead
(cherry picked from commit f4a96d4c85)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-14 17:32:41 +05:30
Chris Suich d9e94717b5 CLOUDSTACK-5785: VM display name cell not updated upon detaching volume from VM
(cherry picked from commit ea29adb7b9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-14 17:31:27 +05:30
Sateesh Chodapuneedi 17676d6bb9 CLOUDSTACK-6652 CLONE - [Automation] Vmware- System's StartCommand failed with "NumberFormatException" while using VMware DVS
vlan id format was like "vlan://<id>" instead of just "<id>". This causes numberformatexception while converting the vlan id to integer form from string form. this was fixed for standard vswitch in bug Cloudstack-5046. now fixed for other 2 cases of dvswitch as well as pvlan.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
(cherry picked from commit a605ca09cd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-14 17:25:34 +05:30
Sateesh Chodapuneedi 1d7adf5216 CLOUDSTACK-7250 [vCenter 5.5] SourceNAT,StaticNAT and Portfowrding is not working with Vmware DVS in vCenter 5.5
Change in vCenter 5.5 API from prior versions forced code change in CloudStack. Update property value of property "VirtualE1000.deviceInfo.summary" is accommodated now.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
(cherry picked from commit dfa607fb44)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
2014-11-14 17:22:34 +05:30
Jayapal d81b67939f CLOUDSTACK-6761: Fixed removing proxy arp rule on deleting static nat or PF rule on ip
The proxy-arp add/del is done on firewall rule add/del.
 The proxy-arp rule is deleted only when there is no static nat or dest nat rule is not using the ip.

 When there is static nat or PF and firewall rule
   a. Delete firewall rule. It skips delete proxy-arp because the rule is used by static nat rule.
   b. After deleting fw rule if we disable static nat there is no way to delete proxy-arp rule.

   On VM expunge we are deleting firewall rules first then static nat rules. This caused the stale proxy-arp
   rules.

   With this fix adding/deleting proxy arp rule on static nat/PF rule add/del.

(cherry picked from commit 19668713ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-14 15:47:46 +05:30
Sheng Yang 76f5f3048e CLOUDSTACK-6432: Blocking DHCP server to service DNS outside network
This would cover only DHCP only network since in basic and shared network, the
private IP used by VR and network may expose to outside.

(cherry picked from commit a554ebdf75)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-11-14 00:19:31 +05:30
Kishan Kavala 83df80b715 CLOUDSTACK-6371: Set snapshot size in copycommand answer during snapshot backup
(cherry picked from commit 295fa84d4d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-14 00:12:16 +05:30
Rohit Yadav 2aabcc11d3 CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a18d067278)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-13 17:49:57 +05:30
Jessica Wang 48f595beac CLOUDSTACK-6805: UI > create account > fix a bug that account creation failed when password contains # character.
(cherry picked from commit 9f4d464640)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-13 17:26:14 +05:30
Rohit Yadav 88d222abaa CLOUDSTACK-6438, CLOUDSTACK-6442: XAPI plugins must be copied to XS master first
Backported fix for 4.3 using e0e226869d by:
Anthony Xu <anthony.xu@citrix.com>

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-11 15:38:15 +05:30
Rohit Yadav c8929dfd10 CLOUDSTACK-7871: allow VM and template details update using update APIs
Allows updating details (key/value) pair which updates entries in
vm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-10 18:12:37 +05:30
Rohit Yadav 9a4e79990a CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage network nic
The fix also persists the configuration in /etc/network/interfaces

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-06 18:23:17 +05:30
Rohit Yadav f7378d8ad5 CVE­2014­3566: Avoid using SSLv3 on apache2 that runs on SSVM
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 14:40:26 +05:30
Rohit Yadav 4f69fab5ee systemvmappliance: upgrade debian iso, openswan crashes with old kernel
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 13:46:24 +05:30
Rohit Yadav faf531ef3c systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE­2014­3566)
Just prefer TLS over SSL in apache configuration in systemvm

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 88acc9bd53)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 01:51:40 +05:30
Daan Hoogland 52cf8af08e whitespace 2014-10-09 10:55:03 +02:00