Commit Graph

4 Commits

Author SHA1 Message Date
SrikanteswaraRao Talluri 798a6aa2e3 Marvin + test changes from master Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 404ac549bf)

Conflicts:
	test/integration/smoke/test_vm_iam.py
	tools/marvin/marvin/deployDataCenter.py
	tools/marvin/marvin/lib/base.py
2014-07-28 17:40:56 +02:00
Ashutosh K 15aeaf25de CLOUDSTACK-2266: Adding automation tests for IP reservation feature
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-04-02 10:53:36 +05:30
SrikanteswaraRao Talluri 5f5416a51c CLOUDSTACK-6125: adding 'selfservice','provisioning' tags to segregate the tests
that can be run on simulator only and that needs hardware.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-03-28 15:38:31 +05:30
Anshul Gangwar 955408166c CLOUDSTACK-2266: marvin tests for IP Address reservation within a network it also adds the ipaddress parameter to virtual machine's create method in base.py
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-09-18 09:21:24 +05:30