28780 Commits

Author SHA1 Message Date
Wilder Rodrigues
79dabfdae4 CLOUDSTACK-8925 - Implement the default egress DENY/ALLOW properly
- Make tests work with right IP and rules
   - Add egress rule for port 53 protocol UDP when testing default egress DENY on RVR
2015-11-04 13:48:04 +01:00
Remi Bergsma
ea70a1872f Merge pull request #1032 from milamberspace/L10N-update-updateMaster-20151104
Update de_DE Localization. Now Web UI 4.6 is fully translated in GermanLast update to have 100% on German in Web UI

Please 2 LGTM before the RC1!

Thanks @resmo

cc @remibergsma @DaanHoogland @karuturi

* pr/1032:
  Update de_DE Localization. Now Web UI 4.6 is fully translated in German

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 13:42:25 +01:00
Remi Bergsma
2af9611c20 Merge pull request #902 from sanju1010/simulator
CLOUDSTACK-8924: Enable dynamic scaling to run test_scale_vm.py test on simulatorSimulator setup uses the config file from following location:
tools/marvin/marvin/config/setup.cfg
Added global setting parameter "enable.dynamic.scale.vm" to above config file, so that dynamic scale vm tests can be run on simulator.

* pr/902:
  CLOUDSTACK-8924: Made changes based on the comments from @pvr9711

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 13:05:43 +01:00
Remi Bergsma
5f61041550 Merge pull request #1009 from rags22489664/master
CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrentlyThe order of templates returned in the response is based on a field called sortkey and by default value for the field is set to 0.

With more than 1000 templates, we tried listing the templates with different page sizes concurrently, and we noticed the results being inconsistent.

Thus we added a secondary order by clause to list templates call on tempZonePair column to make sure the results are consistent.

The addOrderby method of Filter class was also not appending , if we added more orderby clauses.

* pr/1009:
  CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently
  CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 11:48:08 +01:00
Remi Bergsma
2fd6fac214 Merge pull request #898 from bvbharatk/CLOUDSTACK-8902
CLOUDSTACK-8902 Restart Network fails in EIP/ELB zoneThe restart network was failing when using external loadbalencer. The failure was because of a number format exception. When BroadcastDomainType.getValue(guestConfig.getBroadcastUri() is executed this returns a string untagged. We were trying to parse this as long so there was a number pointer exception.

This happens only when the vlan uri is vlan://untagged. in other cases were there is a number instead of untagged (vlan tag) this used to succeed. Although we were trying to convert the number to long we were not really using it. we were converting the number to long and then back to string when creating the IpAddressTo. so I removed this unnecessary conversion in this case for fixing the issue at hand.

I did a manual restart of the network and checked for this number format exception in a EIP/ELB setup.

* pr/898:
  CLOUDSTACK-89027 Restart Network fails in EIP/ELB zone

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 11:37:51 +01:00
Remi Bergsma
6f2e6a7fac Merge pull request #1028 from michaelandersen/fix/vpc_vpn
smoke/test_vpc_vpn: Add template wait & refactor- Added a wait for template download as the test was failing in some environments
- Removed debug timer in setup and teardown
- Increased time.sleep before ssh connection from 10 to 20 seconds
- PEP8
- Changed required_hardware tag to true

* pr/1028:
  smoke/test_vpc_vpn: Add template wait & refactor

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 11:27:58 +01:00
Milamber
54e77df5bb Update de_DE Localization. Now Web UI 4.6 is fully translated in German 2015-11-04 09:52:06 +00:00
Michael Andersen
c883853892 smoke/test_vpc_vpn: Add template wait & refactor
PEP8

Changed hardware tag to true
2015-11-04 07:45:10 +01:00
ramamurtis
9d1a469ae5 CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently
Adding filter test to verify addOrderBy method.
2015-11-04 10:31:02 +05:30
Remi Bergsma
0ba871b127 Merge pull request #1024 from shapeblue/CLOUDSTACK-9019-master
[4.6/master] CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined

During creation of SSVM, checks and adds NetworkOffering.SystemStorageNetwork to
offerings only if storage network exists for the target datacenter.

(Manually tested)

* pr/1024:
  CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-03 21:30:52 +01:00
Wilder Rodrigues
ad4fbcd577 CLOUDSTACK-8925 - Improve the default egress tests in order to cover newly entered rules 2015-11-03 13:59:17 +01:00
Wilder Rodrigues
334daef78f CLOUDSTACK-8925 - Add egress dataset to test_data.py 2015-11-03 13:58:36 +01:00
Rajani Karuturi
0c62c611dd Merge pull request #1026 from ekholabs/fix/test_ssvm-CLOUDSTACK-9021
CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMwareThe test now check the IP taking into account the right interface for VMware/HyperV (eth1).

@karuturi could you please have a look? Unfortunately, I do not have HyperV/VMware test environment.

* pr/1026:
  CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMware

Signed-off-by: Rajani Karuturi <rajani.karuturi@citrix.com>
2015-11-03 17:35:32 +05:30
Wilder Rodrigues
86d1b9632c CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMware 2015-11-03 11:18:11 +01:00
Rohit Yadav
8922707076 CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined
During creation of SSVM, checks and adds NetworkOffering.SystemStorageNetwork to
offerings only if storage network exists for the target datacenter

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-03 13:47:23 +05:30
Wilder Rodrigues
caa0b4071c CLOUDSTACK-8925 - Drop the traffic when default egress is set to false
- The DROP rule should be appended and the other rules inserted.
2015-11-02 21:45:03 +01:00
Remi Bergsma
20bbd342ce Merge pull request #1020 from bvbharatk/CLOUDSTACK-9016
CLOUDSTACK-9016 Fail to create VM instance within VPCbug link https://issues.apache.org/jira/browse/CLOUDSTACK-9016.

CS doe not allocate the ip of the form x.x.x.1 to a guest VM. We seem to incorrectly assume that the first ip in the subnet belongs to the gateway.

* pr/1020:
  CLOUDSTACK-9016: Deploy vm with gateway ip address in VPC
  CLOUDSTACK-9016 Fail to create VM instance within VPC

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-02 20:32:56 +01:00
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