Commit Graph

34084 Commits

Author SHA1 Message Date
Högni Ingimarsson fde0b6aa57 writeIfNotHere requires an array of strings, not a string 2016-03-30 11:17:13 +00:00
Prashanth Manthena de86c0cb17 CLOUDSTACK-9322 : Marvin tests for Internal Lb with Nuage VSP 2016-03-29 11:24:54 +02:00
Nick Livens 741e88833f CLOUDSTACK-9320 : InternalLBVM is not getting destroyed when the last Internal Load Balancer rule is removed for the corresponding source IP address 2016-03-29 11:24:50 +02:00
Nick Livens ae0d6b32d8 CLOUDSTACK-9322 : Changes to support InternalLbVm with Nuage VSP plugin 2016-03-29 11:24:45 +02:00
Aaron Brady ddfc368117 Remove dangerous prototype of applyConfigToVR 2016-03-26 00:39:04 +00:00
Aaron Brady 5d4b5fd642 Use timeout when applying config to virtual router 2016-03-26 00:39:04 +00:00
Simon Weller 48ce763440 Merge pull request #4 from apache/4.7
4.7 PR
2016-03-24 14:55:34 -05:00
Mike Tutkowski 158d196c05 CLOUDSTACK-9297: delete snapshot without id is failing with Unable to determine the storage pool of the snapshot 2016-03-24 12:42:48 -06:00
Will Stevens 5251eeddf2 Merge release branch 4.8 to master
* 4.8:
  Cloudstack 9285 for 4.7.x
  CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
  Cloudstack 9285 for 4.7.x
2016-03-24 11:16:52 -04:00
Will Stevens 64eef2104f Merge release branch 4.7 to 4.8
* 4.7:
  Cloudstack 9285 for 4.7.x
  CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
  Cloudstack 9285 for 4.7.x
2016-03-24 11:15:20 -04:00
Will Stevens 4db1c0125a Merge pull request #1430 from myENA/4.7_cloudstack-9285
CLOUDSTACK-9285 for 4.7.xPer Daan's request, here is a pull request for the 4.7.x release.

* pr/1430:
  Cloudstack 9285 for 4.7.x
  CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
  Cloudstack 9285 for 4.7.x

Signed-off-by: Will Stevens <williamstevens@gmail.com>
2016-03-24 11:01:27 -04:00
Will Stevens c48b6c33c0 Revert "Merge pull request #780 from maneesha-p/pull-19" due code quality issues and lack of CI results.
This reverts commit dc0ba6bd1a, reversing
changes made to 63f58dd578.
2016-03-21 17:38:04 -04:00
Alexandre Limas Santana c2afa584ae Fixed changes to match code conventions 2016-03-20 11:49:04 -03:00
Alexandre Limas Santana 8d6370b21f Fixed Profiler's unit tests bugs.
Problem:
The TestProfiler class was using Java Thread methods to test the
Profiler's functionality. That was causing the tests to fail sometimes
since the JVM's thread priority could be low on some OS. 

Fix:
Using PowerMockito to mock the System calls, the threads could be
removed. This makes the tests considerably faster, OS independent and
still guarantees the correct implementation of the Profiler class.

The changes on the Profiler's class was only to shorten the class's line
size by not assigning the return value to a variable returning it
straight out.
2016-03-19 16:35:25 -03:00
Srikanteswararao Talluri de173bd892 Merge pull request #1431 from sneeladh/master
CLOUDSTACK-9304: Add nuagevsp userdata testcase (Cloudstack-9095) & Refactor existing testcaseshttps://issues.apache.org/jira/browse/CLOUDSTACK-9304

1. Created folder / test / integration / plugins / nuagevsp
 2. Moved test_nuage_vpc_network.py , test_nuage_vsp.py from / test / integration / component /  to---> / test / integration / plugins / nuagevsp/
 3. Added new testcase test_nuage_password_reset.py (Cloudstack-9095)
 4. Added Nuage class in / tools / marvin / marvin / lib / base.py
 5. Added services in / tools / marvin / marvin / config / test_data.py

results:
 test_01_UserDataPasswordReset (nuagevsp.test_nuage_password_reset.TestNuagePasswordReset) ... === TestName: test_01_UserDataPasswordReset | Status : SUCCESS ===
 ok
 Test Basic VPC Network Functionality with NuageVsp network Plugin ... === TestName: test_nuage_vpc_network | Status : SUCCESS ===
 ok
 Test NuageVsp network plugin with basic Isolated Network functionality ... === TestName: test_nuage_vsp | Status : SUCCESS ===
 ok

----------------------------------------------------------------------
 XML: /root/report_xunit.xml
 ----------------------------------------------------------------------
[PassLogs.zip](https://github.com/apache/cloudstack/files/164368/PassLogs.zip)

 Ran 3 tests in 2406.256s

OK

#CLOUDSTACK-9304

* pr/1431:
  Made the code Pyflakes compliant
  CLOUDSTACK-9304 - Exit loop when Physical Network with isolation as VSP is found 	modified:   nuageTestCase.py
  CLOUDSTACK-9304 - Modified Description
  deleted:    test_vpcnetwork_nuage.py 	new file:   ../plugins/nuagevsp/__init__.py
  Add nuagevsp userdata testcase (Cloudstack-9095) & Refactor existing testcases

Signed-off-by: Srikanteswararao Talluri <talluri@apache.org>
2016-03-17 19:49:20 +05:30
Kishan Kavala dc0ba6bd1a Merge pull request #780 from maneesha-p/pull-19
CLOUDSTACK-8800 : Improved the listVirtualMachines API call to include memory utilization information for a VMfor xenserver,kvm and for vmware.

* pr/780:
  CLOUDSTACK-8800 : Improved the listVirtualMachines API call to include memory utilization information for a VM for xenserver,kvm and for vmware.

Signed-off-by: Kishan Kavala <kishan@apache.org>
2016-03-17 12:35:48 +05:30
Maneesha.P 732a85295d CLOUDSTACK-8800 : Improved the listVirtualMachines API call to include memory utilization information for a VM for xenserver,kvm and for vmware. 2016-03-16 16:13:10 +05:30
Sowmya 65d7ae379d Made the code Pyflakes compliant 2016-03-14 18:06:28 -07:00
Rohit Yadav a11f711062 systemvm: set default umask 022 in injectkeys.sh
The default umask of 0022 is set in Ubuntu and other packages. Set the same
in case of CentOS startup scripts. Use umask 022 in the injectkeys.sh script

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-03-14 12:21:57 +01:00
Rodrigo 01034ea8d6 Removed Unused Void Class
Removed the class Void.java from
/cloud-framework-ipc/src/org/apache/cloudstack/framework/async/Void.java
since the method public void AsyncMethod(Object realParam,
AsyncCompletionCallback<Void> callback) does not 
exist and it does not seemed to be used in another place.
Also, removed an unnecessary comment in
/cloudstack-framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java
2016-03-13 14:35:51 -03:00
weingartner b3de01a8dc Fix findbugs slow build 3455 2016-03-13 10:16:47 -03:00
nvazquez c19d8b4739 CLOUDSTACK-9298: Remove user definer from view creations 2016-03-11 07:04:33 -03:00
Sowmya 1446ecd715 CLOUDSTACK-9304 - Exit loop when Physical Network with isolation as VSP is found
modified:   nuageTestCase.py
2016-03-10 18:10:39 -08:00
Rafael Weingärtner 63f58dd578 Merge pull request #1434 from GabrielBrascher/rook-fix
Change variable "ROOK_DISK_CONTROLLER" to "ROOT_DISK_CONTROLLER"Change com.cloud.vm.VmDetailConstants variable name from "ROOK_DISK_CONTROLLER" to "ROOT_DISK_CONTROLLER". The ROOK_DISK_CONTROLLER variable stores the "rootDiskController" String; thus, this PR changes the name to "ROOT_DISK_CONTROLLER".

* pr/1434:
  VmDetailConstants "ROOK_DISK_CONTROLLER" to "ROOT_DISK_CONTROLLER"

Signed-off-by: Rafael Weingärtner <rafael@apache.org>
2016-03-10 20:29:08 -03:00
nvazquez 9857f41d9a CLOUDSTACK-9298: Add @MappedSuperClass support for persistence inheritance 2016-03-10 06:07:29 -08:00
nvazquez db54b26fed CLOUDSTACK-9298: Improve ListTemplatesCmd, ListVolumesCmd and ListVMsCmd performance 2016-03-10 06:07:29 -08:00
Rafael Weingärtner 9a9136e39b Merge pull request #1426 from ntavares/ipsec-psk-rules
ADD be explicit about the underlying limitation - OpenSwanAccording to:
http://linux.die.net/man/5/ipsec.secrets

A preshared secret is most conveniently represented as a sequence of characters, delimited by the double-quote character ("). The sequence cannot contain a newline or double-quote.

* pr/1426:
  ADD be explicit about the underlying limitation - OpenSwan

Signed-off-by: Rafael Weingärtner <rafael@apache.org>
2016-03-09 23:15:08 -03:00
gabrascher fea264c5da VmDetailConstants "ROOK_DISK_CONTROLLER" to "ROOT_DISK_CONTROLLER"
The ROOK_DISK_CONTROLLER variable stores the "rootDiskController"
String; thus, this commit changes the name to "ROOT_DISK_CONTROLLER".
2016-03-09 22:43:55 -03:00
Sowmya 255b7464b0 CLOUDSTACK-9304 - Modified Description 2016-03-08 19:40:43 -08:00
Sowmya 2260263425 deleted: test_vpcnetwork_nuage.py
new file:   ../plugins/nuagevsp/__init__.py
2016-03-08 18:57:24 -08:00
Sowmya 3c8d3d0ee1 Add nuagevsp userdata testcase (Cloudstack-9095) & Refactor existing testcases 2016-03-08 18:13:24 -08:00
Simon Weller 454ea4a0b0 Cloudstack-9285 2016-03-08 09:55:24 -06:00
Simon Weller 3683dff493 Cloudstack 9285 for 4.7.x 2016-03-08 09:48:13 -06:00
Simon Weller c69a242897 CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup 2016-03-08 09:14:07 -06:00
Simon Weller 5b6fbe6aeb Cloudstack 9285 for 4.7.x 2016-03-07 16:23:35 -06:00
Simon Weller c22659d76d Addresses CLOUDSTACK-9300 where the MySQL HA StaticStrategy class fails to load successfully 2016-03-04 06:53:44 -06:00
Nuno Tavares 783aac8268 ADD be explicit about the underlying limitation - OpenSwan 2016-03-02 11:11:34 +01:00
Rafael Weingärtner 359d20e8d6 Merge release branch 4.8 to master
* 4.8:
  CLOUDSTACK-9267: String is not localized on create instance wizards.
2016-02-26 13:15:58 -03:00
Rafael Weingärtner 12a4ca28c4 Merge release branch 4.7 to 4.8
* 4.7:
  CLOUDSTACK-9267: String is not localized on create instance wizards.
2016-02-26 13:07:57 -03:00
Rafael Weingärtner 9610056fa5 Merge pull request #1390 from nitin-maharana/CloudStack-Nitin24_4.7
CLOUDSTACK-9267: String is not localized on create instance wizards.Repro Steps:
==========
1. Setup basic environments as normal.
2. Open a browser, go to Web Console.
3. Upload a iso template.
4. Go to "Instances" page and add new instance.
5. Check the strings on create instance wizards.

Expected Result:
=============
All the strings should be localized on create instance wizards.

Actual Result:
===========
Some strings are not localized on create instance wizards.

Language:
========
JA -> Fail
SC -> Fail

Fix:
===
Fixed the hard coded string.

* pr/1390:
  CLOUDSTACK-9267: String is not localized on create instance wizards.

Signed-off-by: Rafael Weingärtner <rafael@apache.org>
2016-02-25 09:38:25 -03:00
sanjeev 908b769abf Merge pull request #1078 from pritisarap12/CLOUDSTACK-9066-update-testpath-to-delete-account-after-deleting-VMs-of-that-account
CLOUDSTACK-9066: Update testpath to delete account after deleting VM's of that account In testpath_snapshot_hardning.py testpath account was getting cleared prior to VM's of that account hence while cleaning up the account the VM's in that account also gets deleted hence while clearing VM's it gives exception as "No VM found".

* pr/1078:
  CLOUDSTACK-9066: Update testpath to delete account after deleting VMs of that account

Signed-off-by: sanjeev <sanjeev@apache.org>
2016-02-25 14:44:53 +05:30
Rafael Weingärtner d705d85270 Merge pull request #1361 from nvazquez/bothgoals
CLOUDSTACK-9252: Support configurable NFS version for Secondary Storage mountsJIRA Ticket: https://issues.apache.org/jira/browse/CLOUDSTACK-9252

### Description of the problem
After starting secondary storage VM, secondary storage tries to be mounted but fails with error: <code>Protocol family not supported</code>

It was found out that adding <code>-o vers=X</code> to mount command it would work, where <code>X</code> is the desired NFS version to use.
If it is desired to mount a store with a specific NFS version, it has passed in <code>image_store_details</code> table for a store with id <code>Y</code> as a property:

| store_id| name| value |
|:-------------:|:-------------:|:-------------:|
|Y|nfs.version|X (e.g. 3)|
Where X stands for NFS version

* pr/1361:
  CLOUDSTACK-9252: Last refactor, passing nfs version to ssvm
  CLOUDSTACK-9252: Add missing licence header
  CLOUDSTACK-9252: Little refactor
  CLOUDSTACK-9252: Mock application context for unit test
  CLOUDSTACK-9252: Add unit tests
  CLOUDSTACK-9252: New refactor
  CLOUDSTACK-9252: Remove static dependencies, refactor
  CLOUDSTACK-9252: Remove duplicates getNfsVersion, refactor
  CLOUDSTACK-9252: Support configurable nfs version
  CLOUDSTACK-9252: Add nfs version to commands

Signed-off-by: Rafael Weingärtner <rafael@apache.org>
2016-02-24 17:23:28 -03:00
sanjeev 8df8094a01 Merge pull request #1218 from pritisarap12/CLOUDSTACK-9140-Testcase-to-verify-if-Dedicated-cluster-is-used-for-virtual-routers-that-belong-to-non-dedicated-account
CLOUDSTACK-9140: Testcase to verify if Dedicated cluster is used for virtual routers that belong to non dedicated account

* pr/1218:
  CLOUDSTACK-9140: Testcase to verify if Dedicated cluster is used for virtual routers that belong to non dedicated account 	--Adding verification steps to make sure that vm and VR are being 	deployed on dedicated cluster

Signed-off-by: sanjeev <sanjeev@apache.org>
2016-02-24 15:59:17 +05:30
Rafael Weingärtner 4480d05151 Merge pull request #1310 from nvazquez/3dgpu
CLOUDSTACK-9211: Support passing vRAM size to support 3D GPU on VmwareJIRA TICKET:
https://issues.apache.org/jira/browse/CLOUDSTACK-9211

CS support passing hypervisor options by creating entries in <code>vm_template_details</code> or <code>user_vm_details</code>

To enable software 3D GPU 4 options needs to be added:

| name| value |
|:-------------:|:-------------:|
|mks.enable3d|true|
|mks.use3dRenderer|automatic|
|svga.autodetect|false|
|svga.vramSize|(size in KB) e.g. 131072|

Currently all options except <code>svga.vramSize</code> works, VMs always get configured with default 64Mb videoRAM instead of the one provided on the option.

* pr/1310:
  CLOUDSTACK-9211: Unit test for 3dgpu support
  CLOUDSTACK-9211: Refactor vm vram size setter method
  CLOUDSTACK-9211: Add javadoc and refactor method
  CLOUDSTACK-9211: Support passing vRAM size to support 3D GPU on Vmware

Signed-off-by: Rafael Weingärtner <rafael@apache.org>
2016-02-23 20:35:56 -03:00
Remi Bergsma d2fdab0750 Improve ordering of fields of VPC router detail tab
The field we use most are now on the top:
- name
- state
- hypervisor
- link local ip
- redundant state

The other fields are nice, but not needed most of the time.
2016-02-21 20:26:46 +01:00
sanjeev ee150aa631 Merge pull request #1031 from pritisarap12/CLOUDSTACK-9026-Modifying-testpath-for-adding-missing-parameter
CLOUDSTACK-9026: Modifying testpath for adding missing parameterAdding service_offering creation in testpath_storage_migration.py testpath which is missing right now

* pr/1031:
  CLOUDSTACK-9026: Modifying testpath for adding missing parameter

Signed-off-by: sanjeev <sanjeev@apache.org>
2016-02-19 15:52:28 +05:30
Priti Sarap 207b7e3b50 CLOUDSTACK-9026: Modifying testpath for adding missing parameter 2016-02-18 18:19:24 +05:30
sanjeev 79edac0ee6 Merge pull request #1130 from pritisarap12/CLOUDSTACK-9091-Update-testpath-for-parameter-issues
CLOUDSTACK-9091: Update testpath for parameter issuesIn testpath_volume_snapshot testpath creating volume from snapshot function is passing zonid parameter to function in base class but there it doesn't take as separate parameter it takes it from "services" so updating it.

* pr/1130:
  CLOUDSTACK-9091: Update testpath for parameter issues

Signed-off-by: sanjeev <sanjeev@apache.org>
2016-02-18 15:28:45 +05:30
sanjeev bcbdb2caa0 Merge pull request #1199 from pritisarap12/CLOUDSTACK-9128-Testcase-to-verify-if-snapshot_store_ref-table-stores-actual-size-of-back-snapshot-in-secondary-storage
CLOUDSTACK-9128: Testcase to verify physical_size attribute of snapshot_store_ref table Verify if physical_size attribute of snapshot_store_ref table stores actual physical size of the snapshot

* pr/1199:
  CLOUDSTACK-9128: Testcase to verify if snapshot_store_ref table stores actual size of back snapshot in secondary storage

Signed-off-by: sanjeev <sanjeev@apache.org>
2016-02-18 15:19:43 +05:30
Priti Sarap 764afb49fe CLOUDSTACK-9140: Testcase to verify if Dedicated cluster is used for virtual routers that belong to non dedicated account
--Adding verification steps to make sure that vm and VR are being
	deployed on dedicated cluster
2016-02-17 12:36:44 +05:30