cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/5] git commit: updated refs/heads/master to 525c45c
Date Tue, 28 Mar 2017 05:43:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ec2d4dd42 -> 525c45c1e


Fix for test_snapshots.py using nfs2 instead of nfs template


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b792df16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b792df16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b792df16

Branch: refs/heads/master
Commit: b792df163a1953772aa9a4c293b87cba5826a953
Parents: 61ce75e
Author: nvazquez <nicolas.m.vazquez@gmail.com>
Authored: Wed Feb 22 15:54:02 2017 -0300
Committer: nvazquez <nicolas.m.vazquez@gmail.com>
Committed: Wed Mar 1 12:18:35 2017 -0300

----------------------------------------------------------------------
 test/integration/smoke/test_snapshots.py | 2 +-
 tools/marvin/marvin/config/test_data.py  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b792df16/test/integration/smoke/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
index a6230bc..e212e3e 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b792df16/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index c4d1aed..215cdae 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",


Mime
View raw message