Marcus Sorensen c4c9d2d879 Summary: Fixes for api_refactoring ... Detail: api_refactoring branch was recently merged into master. This pulls in those changes and fixes conflicts. Tested to ensure functionality was intact. Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357778902 -0700		2013-01-09 17:48:22 -07:00
..
__init__.py	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00
test_disk_offerings.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_hosts.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_iso.py	marvin: storagetype reference only when attr present	2012-12-09 23:13:24 -08:00
test_network.py	Summary: Removing ostypeid dependencies from tests	2012-11-29 15:41:56 -08:00
test_primary_storage.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_routers.py	Summary: Removing ostypeid dependencies from tests	2012-11-29 15:41:56 -08:00
test_secondary_storage.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_service_offerings.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_ssvm.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_templates.py	Summary: Fixes marvin integration test for copy template/iso between zones	2012-11-29 16:13:46 -08:00
test_vm_life_cycle.py	Summary: Fixes for api_refactoring	2013-01-09 17:48:22 -07:00
test_volumes.py	Summary: Removing ostypeid dependencies from tests	2012-11-29 15:41:56 -08:00