[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 3/3] tests: Move fchostdata into sysfsroot



"fchostdata" is also about sysfs files, it can go home now.
---
 tests/Makefile.am                                     | 2 +-
 tests/fchostdata/fc_host/host4/fabric_name            | 1 -
 tests/fchostdata/fc_host/host4/max_npiv_vports        | 1 -
 tests/fchostdata/fc_host/host4/node_name              | 1 -
 tests/fchostdata/fc_host/host4/npiv_vports_inuse      | 1 -
 tests/fchostdata/fc_host/host4/port_name              | 1 -
 tests/fchostdata/fc_host/host4/port_state             | 1 -
 tests/fchostdata/fc_host/host4/vport_create           | 0
 tests/fchostdata/fc_host/host4/vport_delete           | 0
 tests/fchostdata/fc_host/host5/fabric_name            | 1 -
 tests/fchostdata/fc_host/host5/max_npiv_vports        | 1 -
 tests/fchostdata/fc_host/host5/node_name              | 1 -
 tests/fchostdata/fc_host/host5/npiv_vports_inuse      | 1 -
 tests/fchostdata/fc_host/host5/port_name              | 1 -
 tests/fchostdata/fc_host/host5/port_state             | 1 -
 tests/fchostdata/fc_host/host5/vport_create           | 0
 tests/fchostdata/fc_host/host5/vport_delete           | 0
 tests/fchosttest.c                                    | 2 +-
 tests/sysfsroot/class/fc_host/host4/fabric_name       | 1 +
 tests/sysfsroot/class/fc_host/host4/max_npiv_vports   | 1 +
 tests/sysfsroot/class/fc_host/host4/node_name         | 1 +
 tests/sysfsroot/class/fc_host/host4/npiv_vports_inuse | 1 +
 tests/sysfsroot/class/fc_host/host4/port_name         | 1 +
 tests/sysfsroot/class/fc_host/host4/port_state        | 1 +
 tests/sysfsroot/class/fc_host/host4/vport_create      | 0
 tests/sysfsroot/class/fc_host/host4/vport_delete      | 0
 tests/sysfsroot/class/fc_host/host5/fabric_name       | 1 +
 tests/sysfsroot/class/fc_host/host5/max_npiv_vports   | 1 +
 tests/sysfsroot/class/fc_host/host5/node_name         | 1 +
 tests/sysfsroot/class/fc_host/host5/npiv_vports_inuse | 1 +
 tests/sysfsroot/class/fc_host/host5/port_name         | 1 +
 tests/sysfsroot/class/fc_host/host5/port_state        | 1 +
 tests/sysfsroot/class/fc_host/host5/vport_create      | 0
 tests/sysfsroot/class/fc_host/host5/vport_delete      | 0
 34 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 tests/fchostdata/fc_host/host4/fabric_name
 delete mode 100644 tests/fchostdata/fc_host/host4/max_npiv_vports
 delete mode 100644 tests/fchostdata/fc_host/host4/node_name
 delete mode 100644 tests/fchostdata/fc_host/host4/npiv_vports_inuse
 delete mode 100644 tests/fchostdata/fc_host/host4/port_name
 delete mode 100644 tests/fchostdata/fc_host/host4/port_state
 delete mode 100644 tests/fchostdata/fc_host/host4/vport_create
 delete mode 100644 tests/fchostdata/fc_host/host4/vport_delete
 delete mode 100644 tests/fchostdata/fc_host/host5/fabric_name
 delete mode 100644 tests/fchostdata/fc_host/host5/max_npiv_vports
 delete mode 100644 tests/fchostdata/fc_host/host5/node_name
 delete mode 100644 tests/fchostdata/fc_host/host5/npiv_vports_inuse
 delete mode 100644 tests/fchostdata/fc_host/host5/port_name
 delete mode 100644 tests/fchostdata/fc_host/host5/port_state
 delete mode 100644 tests/fchostdata/fc_host/host5/vport_create
 delete mode 100644 tests/fchostdata/fc_host/host5/vport_delete
 create mode 100644 tests/sysfsroot/class/fc_host/host4/fabric_name
 create mode 100644 tests/sysfsroot/class/fc_host/host4/max_npiv_vports
 create mode 100644 tests/sysfsroot/class/fc_host/host4/node_name
 create mode 100644 tests/sysfsroot/class/fc_host/host4/npiv_vports_inuse
 create mode 100644 tests/sysfsroot/class/fc_host/host4/port_name
 create mode 100644 tests/sysfsroot/class/fc_host/host4/port_state
 create mode 100644 tests/sysfsroot/class/fc_host/host4/vport_create
 create mode 100644 tests/sysfsroot/class/fc_host/host4/vport_delete
 create mode 100644 tests/sysfsroot/class/fc_host/host5/fabric_name
 create mode 100644 tests/sysfsroot/class/fc_host/host5/max_npiv_vports
 create mode 100644 tests/sysfsroot/class/fc_host/host5/node_name
 create mode 100644 tests/sysfsroot/class/fc_host/host5/npiv_vports_inuse
 create mode 100644 tests/sysfsroot/class/fc_host/host5/port_name
 create mode 100644 tests/sysfsroot/class/fc_host/host5/port_state
 create mode 100644 tests/sysfsroot/class/fc_host/host5/vport_create
 create mode 100644 tests/sysfsroot/class/fc_host/host5/vport_delete

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 41c4067..3ae9015 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,7 +52,6 @@ EXTRA_DIST =		\
 	domainsnapshotschematest \
 	domainsnapshotxml2xmlin \
 	domainsnapshotxml2xmlout \
-	fchostdata \
 	interfaceschemadata \
 	lxcxml2xmldata \
 	networkschematest \
@@ -80,6 +79,7 @@ EXTRA_DIST =		\
 	storagevolschematest \
 	storagevolxml2xmlin \
 	storagevolxml2xmlout \
+	sysfsroot \
 	sysinfodata \
 	test-lib.sh	\
 	vmx2xmldata \
diff --git a/tests/fchostdata/fc_host/host4/fabric_name b/tests/fchostdata/fc_host/host4/fabric_name
deleted file mode 100644
index f587b68..0000000
--- a/tests/fchostdata/fc_host/host4/fabric_name
+++ /dev/null
@@ -1 +0,0 @@
-0xffffffffffffffff
diff --git a/tests/fchostdata/fc_host/host4/max_npiv_vports b/tests/fchostdata/fc_host/host4/max_npiv_vports
deleted file mode 100644
index c75acbe..0000000
--- a/tests/fchostdata/fc_host/host4/max_npiv_vports
+++ /dev/null
@@ -1 +0,0 @@
-127
diff --git a/tests/fchostdata/fc_host/host4/node_name b/tests/fchostdata/fc_host/host4/node_name
deleted file mode 100644
index e8c1e1a..0000000
--- a/tests/fchostdata/fc_host/host4/node_name
+++ /dev/null
@@ -1 +0,0 @@
-0x2000001b3289da4e
diff --git a/tests/fchostdata/fc_host/host4/npiv_vports_inuse b/tests/fchostdata/fc_host/host4/npiv_vports_inuse
deleted file mode 100644
index 573541a..0000000
--- a/tests/fchostdata/fc_host/host4/npiv_vports_inuse
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/fchostdata/fc_host/host4/port_name b/tests/fchostdata/fc_host/host4/port_name
deleted file mode 100644
index ee2d399..0000000
--- a/tests/fchostdata/fc_host/host4/port_name
+++ /dev/null
@@ -1 +0,0 @@
-0x2100001b3289da4e
diff --git a/tests/fchostdata/fc_host/host4/port_state b/tests/fchostdata/fc_host/host4/port_state
deleted file mode 100644
index bd1e6d5..0000000
--- a/tests/fchostdata/fc_host/host4/port_state
+++ /dev/null
@@ -1 +0,0 @@
-Linkdown
diff --git a/tests/fchostdata/fc_host/host4/vport_create b/tests/fchostdata/fc_host/host4/vport_create
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/fchostdata/fc_host/host4/vport_delete b/tests/fchostdata/fc_host/host4/vport_delete
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/fchostdata/fc_host/host5/fabric_name b/tests/fchostdata/fc_host/host5/fabric_name
deleted file mode 100644
index 4128070..0000000
--- a/tests/fchostdata/fc_host/host5/fabric_name
+++ /dev/null
@@ -1 +0,0 @@
-0x2001000dec9877c1
diff --git a/tests/fchostdata/fc_host/host5/max_npiv_vports b/tests/fchostdata/fc_host/host5/max_npiv_vports
deleted file mode 100644
index c75acbe..0000000
--- a/tests/fchostdata/fc_host/host5/max_npiv_vports
+++ /dev/null
@@ -1 +0,0 @@
-127
diff --git a/tests/fchostdata/fc_host/host5/node_name b/tests/fchostdata/fc_host/host5/node_name
deleted file mode 100644
index 91a0a05..0000000
--- a/tests/fchostdata/fc_host/host5/node_name
+++ /dev/null
@@ -1 +0,0 @@
-0x2001001b32a9da4e
diff --git a/tests/fchostdata/fc_host/host5/npiv_vports_inuse b/tests/fchostdata/fc_host/host5/npiv_vports_inuse
deleted file mode 100644
index 573541a..0000000
--- a/tests/fchostdata/fc_host/host5/npiv_vports_inuse
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/fchostdata/fc_host/host5/port_name b/tests/fchostdata/fc_host/host5/port_name
deleted file mode 100644
index c37f618..0000000
--- a/tests/fchostdata/fc_host/host5/port_name
+++ /dev/null
@@ -1 +0,0 @@
-0x2101001b32a9da4e
diff --git a/tests/fchostdata/fc_host/host5/port_state b/tests/fchostdata/fc_host/host5/port_state
deleted file mode 100644
index b73dd46..0000000
--- a/tests/fchostdata/fc_host/host5/port_state
+++ /dev/null
@@ -1 +0,0 @@
-Online
diff --git a/tests/fchostdata/fc_host/host5/vport_create b/tests/fchostdata/fc_host/host5/vport_create
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/fchostdata/fc_host/host5/vport_delete b/tests/fchostdata/fc_host/host5/vport_delete
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/fchosttest.c b/tests/fchosttest.c
index 035f721..3d64671 100644
--- a/tests/fchosttest.c
+++ b/tests/fchosttest.c
@@ -22,7 +22,7 @@
 #include "virutil.h"
 #include "testutils.h"
 
-#define TEST_FC_HOST_PREFIX "./fchostdata/fc_host/"
+#define TEST_FC_HOST_PREFIX "./sysfsroot/class/fc_host/"
 #define TEST_FC_HOST_NUM 5
 
 /* Test virIsCapableFCHost */
diff --git a/tests/sysfsroot/class/fc_host/host4/fabric_name b/tests/sysfsroot/class/fc_host/host4/fabric_name
new file mode 100644
index 0000000..f587b68
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host4/fabric_name
@@ -0,0 +1 @@
+0xffffffffffffffff
diff --git a/tests/sysfsroot/class/fc_host/host4/max_npiv_vports b/tests/sysfsroot/class/fc_host/host4/max_npiv_vports
new file mode 100644
index 0000000..c75acbe
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host4/max_npiv_vports
@@ -0,0 +1 @@
+127
diff --git a/tests/sysfsroot/class/fc_host/host4/node_name b/tests/sysfsroot/class/fc_host/host4/node_name
new file mode 100644
index 0000000..e8c1e1a
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host4/node_name
@@ -0,0 +1 @@
+0x2000001b3289da4e
diff --git a/tests/sysfsroot/class/fc_host/host4/npiv_vports_inuse b/tests/sysfsroot/class/fc_host/host4/npiv_vports_inuse
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host4/npiv_vports_inuse
@@ -0,0 +1 @@
+0
diff --git a/tests/sysfsroot/class/fc_host/host4/port_name b/tests/sysfsroot/class/fc_host/host4/port_name
new file mode 100644
index 0000000..ee2d399
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host4/port_name
@@ -0,0 +1 @@
+0x2100001b3289da4e
diff --git a/tests/sysfsroot/class/fc_host/host4/port_state b/tests/sysfsroot/class/fc_host/host4/port_state
new file mode 100644
index 0000000..bd1e6d5
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host4/port_state
@@ -0,0 +1 @@
+Linkdown
diff --git a/tests/sysfsroot/class/fc_host/host4/vport_create b/tests/sysfsroot/class/fc_host/host4/vport_create
new file mode 100644
index 0000000..e69de29
diff --git a/tests/sysfsroot/class/fc_host/host4/vport_delete b/tests/sysfsroot/class/fc_host/host4/vport_delete
new file mode 100644
index 0000000..e69de29
diff --git a/tests/sysfsroot/class/fc_host/host5/fabric_name b/tests/sysfsroot/class/fc_host/host5/fabric_name
new file mode 100644
index 0000000..4128070
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host5/fabric_name
@@ -0,0 +1 @@
+0x2001000dec9877c1
diff --git a/tests/sysfsroot/class/fc_host/host5/max_npiv_vports b/tests/sysfsroot/class/fc_host/host5/max_npiv_vports
new file mode 100644
index 0000000..c75acbe
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host5/max_npiv_vports
@@ -0,0 +1 @@
+127
diff --git a/tests/sysfsroot/class/fc_host/host5/node_name b/tests/sysfsroot/class/fc_host/host5/node_name
new file mode 100644
index 0000000..91a0a05
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host5/node_name
@@ -0,0 +1 @@
+0x2001001b32a9da4e
diff --git a/tests/sysfsroot/class/fc_host/host5/npiv_vports_inuse b/tests/sysfsroot/class/fc_host/host5/npiv_vports_inuse
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host5/npiv_vports_inuse
@@ -0,0 +1 @@
+0
diff --git a/tests/sysfsroot/class/fc_host/host5/port_name b/tests/sysfsroot/class/fc_host/host5/port_name
new file mode 100644
index 0000000..c37f618
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host5/port_name
@@ -0,0 +1 @@
+0x2101001b32a9da4e
diff --git a/tests/sysfsroot/class/fc_host/host5/port_state b/tests/sysfsroot/class/fc_host/host5/port_state
new file mode 100644
index 0000000..b73dd46
--- /dev/null
+++ b/tests/sysfsroot/class/fc_host/host5/port_state
@@ -0,0 +1 @@
+Online
diff --git a/tests/sysfsroot/class/fc_host/host5/vport_create b/tests/sysfsroot/class/fc_host/host5/vport_create
new file mode 100644
index 0000000..e69de29
diff --git a/tests/sysfsroot/class/fc_host/host5/vport_delete b/tests/sysfsroot/class/fc_host/host5/vport_delete
new file mode 100644
index 0000000..e69de29
-- 
1.8.1.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]