From b792df163a1953772aa9a4c293b87cba5826a953 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Wed, 22 Feb 2017 15:54:02 -0300 Subject: [PATCH] Fix for test_snapshots.py using nfs2 instead of nfs template --- test/integration/smoke/test_snapshots.py | 2 +- tools/marvin/marvin/config/test_data.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py index a6230bc4940..e212e3e9783 100644 --- a/test/integration/smoke/test_snapshots.py +++ b/test/integration/smoke/test_snapshots.py @@ -275,7 +275,7 @@ class TestSnapshotRootDisk(cloudstackTestCase): assert isinstance(clusters,list) and len(clusters)>0 storage = StoragePool.create(self.apiclient, - self.services["nfs"], + self.services["nfs2"], clusterid=clusters[0].id, zoneid=self.zone.id, podid=self.pod.id diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index c4d1aed3daf..215cdaecc3f 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -962,6 +962,10 @@ test_data = { "url": "nfs://nfs/export/automation/1/testprimary", "name": "Primary XEN" }, + "nfs2": { + "url": "nfs://nfs/export/automation/1/testprimary2", + "name": "Primary XEN 2" + }, "iscsi": { "url": "iscsi://192.168.100.21/iqn.2012-01.localdomain.clo-cstack-cos6:iser/1",