From 779e49054a9db999f9dbb1bba7c684f9f53e21aa Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Mon, 23 Jan 2017 15:24:59 -0500
Subject: [PATCH] tests: Alter test_driver HBA name/data to be closer to
 reality

Alter "test-scsi-host-vport" to be "scsi_host1" to match the real
environment. This is the vport capable HBA - IOW the NPIV device.
Add more fields to scsi_host1 as well.

Alter the XML being used by the objecttest to create a vHBA in order
to match the scsi_host1 parent name and to use validateable wwnn/wwpn.
This will allow for realistic testing.
---
 src/test/test_driver.c  | 9 +++++++--
 tests/objecteventtest.c | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2f687e0e13..1877e5482a 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -487,15 +487,20 @@ static const char *defaultConnXML =
 "  </capability>"
 "</device>"
 "<device>"
-"  <name>test-scsi-host-vport</name>"
+"  <name>scsi_host1</name>"
 "  <parent>computer</parent>"
 "  <capability type='scsi_host'>"
 "    <host>1</host>"
+"    <unique_id>0</unique_id>"
 "    <capability type='fc_host'>"
 "      <wwnn>2000000012341234</wwnn>"
 "      <wwpn>1000000012341234</wwpn>"
+"      <fabric_wwn>2000000043214321</fabric_wwn>"
+"    </capability>"
+"    <capability type='vport_ops'>"
+"      <max_vports>127</max_vports>"
+"      <vports>0</vports>"
 "    </capability>"
-"    <capability type='vport_ops'/>"
 "  </capability>"
 "</device>"
 "</node>";
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index d25a9e2c59..5df6ff91e7 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -63,11 +63,11 @@ static const char storagePoolDef[] =
 
 static const char nodeDeviceDef[] =
 "<device>\n"
-"  <parent>test-scsi-host-vport</parent>\n"
+"  <parent>scsi_host1</parent>\n"
 "  <capability type='scsi_host'>\n"
 "    <capability type='fc_host'>\n"
-"      <wwpn>1111222233334444</wwpn>\n"
-"      <wwnn>5555666677778888</wwnn>\n"
+"      <wwpn>1000000023452345</wwpn>\n"
+"      <wwnn>2000000023452345</wwnn>\n"
 "    </capability>\n"
 "  </capability>\n"
 "</device>\n";