28762 Commits

Author SHA1 Message Date
Remi Bergsma
2cd789e93a Merge pull request #1012 from wido/tmpdir-in-test
Use java.io.tmpdir instead of hardcoded /tmpThis was submitted earlier in PR #884 but that did not merge
properly.

This is a new PR with the same change.

* pr/1012:
  Use java.io.tmpdir instead of hardcoded /tmp

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 20:22:16 +01:00
Remi Bergsma
7f1326c213 Merge pull request #891 from nitin-maharana/CloudStack-Nitin9
CLOUDSTACK-8913: Search box in Templates tab out of alignmentIncreased the margin and padding to accomodate all the boxes inside toolbar.

* pr/891:
  CLOUDSTACK-8913: Search box in Templates tab out of alignment

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 20:18:34 +01:00
Remi Bergsma
8db10be093 Merge pull request #897 from nitin-maharana/CloudStack-Nitin10
CLOUDSTACK-8919: Slow UI response while loading the list of networks in network tab.Instead of searching for each network, now it is searching for each zone.
For basic zone, it will show the security group directly because by default securitygroupsenabled is true.
For advanced zone, check the securitygroupsenabled option in each zone. If any one has value true, then show.

* pr/897:
  CLOUDSTACK-8919: Slow UI response while loading the list of networks in network tab.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 20:04:51 +01:00
Remi Bergsma
0b4cc5de87 Merge pull request #986 from wido/kvm-libvirt-unittests
Add Unit Tests for Libvirt/KVM storage codeThese classes were not covered by Unit Tests and this commit
adds some tests for their basic functionality.

* pr/986:
  Add Unit Tests for Libvirt/KVM storage code

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 17:53:31 +01:00
Remi Bergsma
0c52f70b45 Merge pull request #995 from kansal/CLOUDSTACK-9002
CLOUDSTACk-9002: VM deployment is successful even when dhcp entry command fails - Fixed

Reason: The return value of the call to accept() function in the applyRules() function of BasicNetworkTopology.java was not checked for success or failure. As a result even if it fails, exception was not thrown and VM deployment went ahead without any errors.

Fix: Added the necessary checks.

* pr/995:
  CLOUDSTACk-9002: VM deployment is successful even when dhcp entry command fails - Fixed

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 14:18:21 +01:00
Remi Bergsma
3d213b66e7 Merge pull request #916 from kansal/CLOUDSTACK-8940
CLOUDSTACK-8940: Wrong value is inserted into nics table netmask field when creating a VM - Fixed

Problem: When creating a VM in shared network with no service, the value of netmask is added in the table in the CIDR format unlike other cases where it is added as normal string in the format xxx.xxx.xxx.xxx. The netmask column in the nics table has a length of 15 chars which gets violated if the CIDR exceeds it(Max CIDR length can be 18).

Fix: Before storing the netmask convert from CIDR to native format.

* pr/916:
  CLOUDSTACK-8940: Wrong value is inserted into nics table netmask field when creating a VM - Fixed

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 14:16:29 +01:00
Remi Bergsma
abbdb2ef2f Merge pull request #903 from nitin-maharana/nitin1
CLOUDSTACK-8928: While adding VMs to LB rule, default NIC IP is always displayed rather than the IP corresponding to the NIC where LB is being createdWhile calling the listNics API, instead of sending the default nic id as parameter, it should send the network id as a parameter.

So, replaced that nicid parameter as networkid parameter.

* pr/903:
  CLOUDSTACK-8928: While adding VMs to LB rule, default NIC IP is always displayed rather than the IP corresponding to the NIC where LB is being created

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 13:54:53 +01:00
Remi Bergsma
970f95c35a Merge pull request #1001 from milamberspace/L10N-update-forNext46-v2
Update L10N Web UI resource files before 4.6 RC1 (v2)Update the localization files for the next CloudStack 4.6.

This PR cancel and replace the #984.

cc @remibergsma

* pr/1001:
  Update de_DE and it_IT translations from Transifex
  Update L10N Web UI resource files before 4.6 RC1 (v2)

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 13:42:05 +01:00
Remi Bergsma
5ebcc4371a Merge pull request #1016 from mike-tutkowski/hsr_marvin
CLOUDSTACK-9008 - Pass hypervisor snapshot reserve field in when creating compute and disk offerings

https://issues.apache.org/jira/browse/CLOUDSTACK-9008

* pr/1016:
  CLOUDSTACK-9008 - Pass hypervisor snapshot reserve field in when creating compute and disk offerings

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 13:40:11 +01:00
Remi Bergsma
9c90eff87f Merge pull request #1015 from DaanHoogland/pr/975
CLOUDSTACK-8964: Ovm3HypervisorGuru answer fix and snapshot to volume implementation.some clean up of code after the fix from #975

* pr/1015:
  CLOUDSTACK-8964 side effect isolation  extract side effect away to emphasize the main commandDelegation objective
  host delegation logging for XenServerGuru.java
  Getting volume from snapshot working again... odd
  simple change to prevent failure and keep OVM3 snapshots working

This closes #975

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 13:37:19 +01:00
Remi Bergsma
30a8528973 Merge pull request #1005 from wido/libvirt-unittests
kvm: Add UnitTests for LibvirtUtilitiesHelperThese were lacking, but this helper is used in various places
inside the KVM code.

Some simple tests to verify the helper is doing what we expect it
to do.

* pr/1005:
  kvm: Add UnitTests for LibvirtUtilitiesHelper

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 13:31:51 +01:00
Remi Bergsma
a981d34f49 Merge pull request #787 from anshul1886/CLOUDSTACK-8824-8825
CLOUDSTACK-8825, CLOUDSTACK-8824 : Fixed issues if vm.allocation.algorithm is set to firstfitleastconsumedFixed following issues if vm.allocation.algorithm is set to firstfitleastconsumed

1. VM deployment failure if thre is only ZWPS in setup
2. VM migration is impossible from UI

To test

1. Create setup with ZWPS only
2. set vm.allocation.algorithm to firstfitleastconsumed in global settings
3. deploy virtual machine

observation: vm deployment will fail

After this fix it will pass

second scenario

1. Create Cloudstack Setup with two hosts (As it needs setup for migration)
2. Try migrating VM from UI

Observation: There will be error response in logs with nothing available in UI

After fix it will pass

Regarding BVT I am not sure whether there exists tests for firstfitleastconsumed vm allocation algorithm.

* pr/787:
  CLOUDSTACK-8825, CLOUDSTACK-8824 : Fixed following issues if vm.allocation.algorithm is set to firstfitleastconsumed 1. VM deployment failure if thre is only ZWPS in setup 2. VM migration is impossible from UI

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 12:04:34 +01:00
Remi Bergsma
e3a4ec6cfd Merge pull request #1014 from ustcweizhou/CLOUDSTACK-9013
CLOUDSTACK-9013: Virtual router failed to start on KVMThis fix a typo of commit 4a177031b055f3649e3b4a00c80eddb5cafa1dd7

* pr/1014:
  CLOUDSTACK-9013: Virtual router failed to start on KVM

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 11:56:12 +01:00
sanjeev
7d1dc04a43 CLOUDSTACK-9016: Deploy vm with gateway ip address in VPC
Signed-off-by: sanjeev <sanjeev@apache.org>
2015-11-02 14:41:25 +05:30
Bharat Kumar
475fc38481 CLOUDSTACK-9016 Fail to create VM instance within VPC 2015-11-02 14:08:19 +05:30
Milamber
34fee547cd Update de_DE and it_IT translations from Transifex 2015-11-01 17:41:27 +00:00
Milamber
016c80c341 Update L10N Web UI resource files before 4.6 RC1 (v2) 2015-11-01 17:38:43 +00:00
Wido den Hollander
ea92fc15ce Use java.io.tmpdir instead of hardcoded /tmp
This was submitted earlier in PR #884 but that did not merge
properly.

This is a new PR with the same change.
2015-10-31 12:03:11 +01:00
Remi Bergsma
acce645119 Merge pull request #1008 from davidamorimfaria/master
CLOUDSTACK-8812 / CLOUDSTACK-9010: adjust packaging for centos7

Here are a few adjustments for the packaging in centos7. With these changes I was able to start the service. Please review. Thank you.

* pr/1008:
  CLOUDSTACK-9010: adjust packaging for centos7

This closes #888

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-31 11:55:06 +01:00
David Amorim Faria
be75b7f44c CLOUDSTACK-9010: adjust packaging for centos7
* Adjust systemd service to match tomcat7 startup,
   and change service type to simple.

 * Adjust sysconfig to only have one JAVA_OPTS
   due to behaviour change in tomcat7.

 * Adjust spec to remove some config files
   from WEB-INF since they are placed in /etc.
   This is a similar behaviour to the centos6 spec.
2015-10-31 08:47:15 +01:00
Mike Tutkowski
c2d4d2972d CLOUDSTACK-9008 - Pass hypervisor snapshot reserve field in when creating compute and disk offerings 2015-10-30 22:13:56 -06:00
Wei Zhou
9f7f42330a CLOUDSTACK-9013: Virtual router failed to start on KVM
This fix a typo of commit 4a177031b055f3649e3b4a00c80eddb5cafa1dd7
2015-10-30 20:04:56 +01:00
Remi Bergsma
901d47c07e Merge pull request #818 from kansal/CLOUDSTACK-8844
Fixed: Network Update from RVR offering to Standalone offering failsProblem: Moving a RVR network offering to standalone makes the status of VR's as UNKNOWN and Redundant Router marked with YES.
Fix: The network's isRedundant was not getting updated.

* pr/818:
  CLOUDSTACK-8844: Network Update from RVR offering to Standalone offering fails - Fixed

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-30 17:02:34 +01:00
Remi Bergsma
beaed0e9b3 Merge pull request #913 from radu-stefanache/more_typo_fixes
another typo that appears when monitoring the java process via JMXStatus : in preogress instead of in progress and some other small typos .

* pr/913:
  another typo that appears when monitoring the java process via JMX

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-30 16:59:34 +01:00
Remi Bergsma
ab749ed97d Merge pull request #982 from remibergsma/fix-s3-swift
CLOUDSTACK-9014 Rename xapi plugins for s3 and swift to make them work after renaming the callsMake renaming introduced in a8212d9ef458dd7ac64b021e6fa33fcf64b3cce0 work for S3 and Swift xapi plugins.

This PR is to address comments in PR #970

* pr/982:
  Rename xapi plugins for s3 and swift to make them work after renaming the calls

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-30 16:18:40 +01:00
Remi Bergsma
bc5a5d6623 Merge pull request #1006 from greenqloud/user_vm_keypairs_fix
Fixed user_vm_view to only display keypairs belonging to the account.The user_vm_view displayes the keypair information by joining vm_details with ssh_keypairs on the key value exclusively.

We found a scenario in which this can cause information leakage. If there are two accounts using the same key, but create a different key name for it, and then a vm is created using one of the keys, the view will list both keypairs as belonging to the vm, which can in turn cause confusion to the users who see a keypair name which they did not create.

The fix simply limits the view to displaying keypairs which belong to vm's account.

I added it to the latest schema migration only; should I also include it in the previous ones?

* pr/1006:
  CLOUDSTACK-9011 - Fixed user_vm_view to only display keypairs belonging to the account.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-30 12:40:43 +01:00
Wido den Hollander
602231132d kvm: Add UnitTests for LibvirtUtilitiesHelper
These were lacking, but this helper is used in various places
inside the KVM code.

Some simple tests to verify the helper is doing what we expect it
to do.
2015-10-30 12:34:00 +01:00
nnesic
9191da3112 CLOUDSTACK-9011 - Fixed user_vm_view to only display keypairs belonging to the account. 2015-10-30 11:16:10 +00:00
Remi Bergsma
af90caf63a Merge pull request #992 from shapeblue/master-logrotate-kvm-agent-erroutlogs
[master/4.6] CLOUDSTACK-9000: logrotate cloudstack-agent out and err logsAdds logrotate rules for cloudstack-agent.{err,out}, jsvc err/out log files may fill up disk. This adds a logrotate config in the rpm packages

cc @remibergsma @wido @wilderrodrigues and others

* pr/992:
  CLOUDSTACK-9000: logrotate cloudstack-agent out and err logs

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-30 11:24:48 +01:00
Nitin Kumar Maharana
834ab53d87 CLOUDSTACK-8928: While adding VMs to LB rule, default NIC IP is always displayed rather than the IP corresponding to the NIC where LB is being created
While calling the listNics API, instead of sending the default nic id as parameter, it should send the network id as a parameter.
So, replaced that nicid parameter as networkid parameter.
2015-10-30 15:12:36 +05:30
Nitin Kumar Maharana
e8c4b2b44b CLOUDSTACK-8919: Slow UI response while loading the list of networks in network tab.
Instead of searching for each network, now it is searching for each zone.
For basic zone, it will show the security group directly because by default securitygroupsenabled is true.
For advanced zone, check the securitygroupsenabled option in each zone. If any one has value true, then show.
2015-10-30 15:11:02 +05:30
Nitin Kumar Maharana
febaeb2a15 CLOUDSTACK-8913: Search box in Templates tab out of alignment
Increased the margin and padding to accomodate all the boxes inside toolbar.
2015-10-30 15:09:23 +05:30
Daan Hoogland
fc18d1e8b1 CLOUDSTACK-8964 side effect isolation
extract side effect away to emphasize the main commandDelegation
objective
2015-10-30 09:00:47 +01:00
Remi Bergsma
930ef8dc7b Merge pull request #879 from pdube/CLOUDSTACK-8793
CLOUDSTACK-8793 Enable s2s VPN connection for projects

* pr/879:
  CLOUDSTACK-8793 Added project id to create vpn customer gateway, and to the impl of list vpn connections and list vpn customer gateways

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-30 08:35:06 +01:00
Kshitij Kansal
e24ecccdea CLOUDSTACK-8844: Network Update from RVR offering to Standalone offering fails - Fixed 2015-10-30 10:54:45 +05:30
ramamurtis
c90723f491 CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently 2015-10-30 09:44:59 +05:30
Remi Bergsma
c03956ebec Merge pull request #848 from iwebhosting/lbprotocol
Pass LbProtocol down to the HAProxyConfiguratorThis will let us specify a new load balancer protocol (tcp-proxy) which enables HAProxy's `send-proxy` functionality.

`send-proxy` / [the PROXY protocol][1] will send the real connection origin IP through to the servers behind HAProxy, without requiring any protocol specific changes (such as HTTP header rewriting).

[1]: http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt

This is also inline with what [Amazon ELB now supports][2].

[2]: http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/enable-proxy-protocol.html

* pr/848:
  Pass LbProtocol down to the HAProxyConfigurator

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-29 20:15:20 +01:00
Remi Bergsma
093cccfce2 Merge pull request #945 from nitin-maharana/CloudStack-Nitin11
CLOUDSTACK-8962: Dedicated cluster is used for virtual routers that belong to non-dedicated account
Earlier the deployment planner was not handling the case of virtual routers.(In Explicit Dedication)
It was only handling for all instance VMs/user VMs.
Added code for checking the case of Virtual Routers.

* pr/945:
  CLOUDSTACK-8962: Dedicated cluster is used for virtual routers that belong to non-dedicated account

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-29 20:10:31 +01:00
Remi Bergsma
d8f9c235e9 Merge pull request #1002 from ekholabs/test/dhcphosts-CLOUDSTACK-9007
CLOUDSTACK-9007 - Write test to check that the /etc/dhcphosts.txt doesn't contain duplicate IPsThis PR contains a test that will cover the fix on PR #981

The tests does the following:

* Creates account, service offering, network offering, network
* Deploys two virtual machines
  - Each machine with a pre-assigned IP
* Creates two FW and PF rules
* Checks that SSH into the VMs works
* Checks default routes from both VMs
* Checks that the /etc/dhcphosts.txt contains 1 entry per VM IP
* Destroys/Expunges 1 VM
* Creates a new VM with the same IP as the destroyed one
* Checks that the /etc/dhcphosts.txt contains 1 entry per VM IP

* pr/1002:
  CLOUDSTACK-9007 - Add test check that /etc/dhcphosts.txt doesn't contain duplicate IPs

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-29 19:55:24 +01:00
Remi Bergsma
c60a8a8056 Revert "Merge pull request #961 from K0zka/CLOUDSTACK-8977"
This reverts commit 29d42c7174f90bfeda91aa9ad9fca7deb985911b, reversing
changes made to 5cacd995700a915d239a45b23bd8ea8e5a4fca8f.
2015-10-29 19:11:19 +01:00
Remi Bergsma
323a2aaa2a Merge pull request #981 from serbaut/repopulate-dhcphost
CLOUDSTACK-8993: DHCP fails with "no address available" when an IP is reused

Repopulate /etc/dhcphosts.txt to remove old entries with the same IP address.

* pr/981:
  CLOUDSTACK-8993: DHCP fails with "no address available" when an IP is reused

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-29 15:56:54 +01:00
Remi Bergsma
73c6c6c96b Merge pull request #996 from karuturi/CLOUDSTACK-8984
[4.6] CLOUDSTACK-8984: VPC Network offerings tab missing from UIThis is a regression from commit af2f21894ce061faadc8cec29b901719303a29dc

added vpcofferings to the select list

Before the change (from the bug):
![offerings_46](https://cloud.githubusercontent.com/assets/186833/10781847/34ae9bc4-7d71-11e5-8159-b90422ef34f6.png)

After the change:
![screen shot 2015-10-28 at 12 32 59 pm](https://cloud.githubusercontent.com/assets/186833/10781850/3ef96500-7d71-11e5-84c5-34589ec10bf9.png)

* pr/996:
  CLOUDSTACK-8984: VPC Network offerings tab missing from UI

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-29 15:43:14 +01:00
Wilder Rodrigues
bf3c894fb9 CLOUDSTACK-9007 - Add test check that /etc/dhcphosts.txt doesn't contain duplicate IPs 2015-10-29 15:22:58 +01:00
Kshitij Kansal
ba26efcdf2 CLOUDSTACK-8940: Wrong value is inserted into nics table netmask field when creating a VM - Fixed 2015-10-29 17:04:58 +05:30
Remi Bergsma
eabf11c99d Merge pull request #998 from ekholabs/fix/vr_passwd_server-CLOUDSTACK-8957
CLOUDSTACK-8957 - VR password server feature is brokenThis PR implements the update of the password as it use to be done with the bash file, but using the Python code for it.

A new integration test was added in order to cover the fix. The test can be found at component/test_password_server.py and does the following:

* Creates an Account
* Creates a Service Offering
* Creates a Network Offering
* Creates a Network
* Creates two Virtual Machines
* Creates two FW rules
* Creates two PF rules
* SSH into each VM and checks the default routes (by pinging 8.8.8.8)
* SSH to the host and executes a command in the router to check the password-[gateway] file
  - The file is under /var/cache/cloud/passwords-[gateway]

The [gateway] is replaced by the gateway from each virtual machine NIC.

* pr/998:
  CLOUDSTACK-8957 - Add integration test that cheks if the password file is present and not empty
  CLOUDSTACK-8957 - Implement password server in configure.py

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-29 09:34:54 +01:00
Wilder Rodrigues
097ef34b85 CLOUDSTACK-8957 - Add integration test that cheks if the password file is present and not empty 2015-10-29 07:14:51 +01:00
Wilder Rodrigues
b2aa1f8417 CLOUDSTACK-8957 - Implement password server in configure.py 2015-10-29 07:14:51 +01:00
Rajani Karuturi
d9f614cea2 CLOUDSTACK-8984: VPC Network offerings tab missing from UI
This is a regression from commit af2f21894ce061faadc8cec29b901719303a29dc

added vpcofferings to the select list
2015-10-29 09:21:16 +05:30
Pierre-Luc Dion
fb2e5d2aad squashed commit for dockerfiles part#2 including comments from PR#910 2015-10-28 22:34:31 -04:00
Remi Bergsma
1f6781babc Merge pull request #989 from ekholabs/fix/cleanup_vr_ips-CLOUDSTACK-8991
CLOUDSTACK-8991 - IP address is not removed from VR even after disabling static NATThis PR fixes the Public IP removal form the virtual routers. It also improves the existing test_network.py.

* pr/989:
  CLOUDSTACK-8991 - Process the IPs that have been removed
  CLOUDSTACK-8991 - Remove public IP form interface in case add = false
  CLOUDSTACK-8991 - Make sure the public IP is removed form the router before checking

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-28 22:24:40 +01:00