SrikanteswaraRao Talluri 0e223d6787 Merge branch 'master' into marvin ...

Conflicts:
	test/integration/component/test_base_image_updation.py
	test/integration/component/test_cpu_domain_limits.py
	test/integration/component/test_cpu_limits.py
	test/integration/component/test_cpu_project_limits.py
	test/integration/component/test_ip_reservation.py
	test/integration/component/test_memory_limits.py
	test/integration/component/test_mm_domain_limits.py
	test/integration/component/test_mm_project_limits.py
	test/integration/component/test_persistent_networks.py
	test/integration/component/test_portable_ip.py
	test/integration/component/test_routers.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_deploy_vm_with_userdata.py
	test/integration/smoke/test_internal_lb.py
	test/integration/smoke/test_vm_life_cycle.py
	test/integration/smoke/test_volumes.py
	tools/marvin/marvin/codes.py
	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/lib/base.py
	tools/marvin/marvin/lib/common.py
	tools/marvin/marvin/lib/utils.py

2014-04-08 17:53:37 +05:30

..

cpu_limits

CLOUDSTACK-4934: Rename Limit resources tests so that they have unique names.

2013-11-08 10:25:39 +05:30

maint

CLOUDSTACK-6316: Fixed component and smoke test failures for wrong references

2014-04-08 16:08:27 +05:30

__init__.py

apply chip childers licensing patches for the test directory

2012-06-26 11:19:58 -04:00

test_accounts.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_add_remove_network.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_advancedsg_networks.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_affinity_groups.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_allocation_states.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_asa1000v_fw.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_assign_vm.py

CLOUDSTACK-6316: Fixed issues in various files(testcases and marvin related)

2014-04-04 19:46:25 +05:30

test_baremetal.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_base_image_updation.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_blocker_bugs.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_cpu_domain_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_cpu_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_cpu_max_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_cpu_project_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_custom_hostname.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_deploy_vm_userdata_reg.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_dynamic_compute_offering.py

CLOUDSTACK-6147: Adding first set of test caess for Dynamic Compute Offering feature

2014-03-10 11:20:44 +05:30

test_egress_fw_rules.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_egress_rules.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_eip_elb.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_explicit_dedication.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_haproxy.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_implicit_planner.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_ip_reservation.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_ldap.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_memory_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_mm_domain_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_mm_max_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_mm_project_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_multiple_ip_ranges.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_multiple_ips_per_nic.py

CLOUDSTACK-4840: Final set of test cases for Multiple IPs

2014-03-23 21:15:45 -07:00

test_netscaler_configs.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_netscaler_lb_algo.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_netscaler_lb_sticky.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_netscaler_lb.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_netscaler_nw_off.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_network_offering.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_non_contiguous_vlan.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_persistent_networks.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_portable_ip.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_project_configs.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_project_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_project_resources.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_project_usage.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_projects.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_recurring_snapshots.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_redundant_router_cleanups.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_redundant_router_services.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_redundant_router_upgrades.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_region_vpc.py

region level VPC support

2014-03-20 16:32:22 +05:30

test_regions_accounts.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_regions.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_reset_ssh_keypair.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_resource_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_routers.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_security_groups.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_shared_networks.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_snapshot_gc.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_snapshot_limits.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_snapshots_improvement.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_snapshots.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_stopped_vm.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_storage_motion.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_tags.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_templates.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_update_vm.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_usage.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vm_passwdenabled.py

CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions

2014-02-26 17:13:21 +05:30

test_vmware_drs.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_volumes.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_distributed_routing_offering.py

integration tests for VPC's enabled for distributed routing

2014-03-14 16:56:38 +05:30

test_vpc_network_lbrules.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_network_pfrules.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_network_staticnatrule.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_network.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_offerings.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_routers.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_vm_life_cycle.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc_vms_deployment.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpc.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

test_vpn_users.py

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30