tests: Adapt to added NBFT SSNS flags

+ regenerate the sample table outputs.

Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>

diff --git a/test/nbft/diffs/NBFT-Dell.PowerEdge.R660-fw1.5.5-single b/test/nbft/diffs/NBFT-Dell.PowerEdge.R660-fw1.5.5-single
index 72a34def45cc5bf471b5050c6835187c51113453..17631fb3386d096f44c89a162b56f38dcae51efc 100644 (file)
--- a/test/nbft/diffs/NBFT-Dell.PowerEdge.R660-fw1.5.5-single
+++ b/test/nbft/diffs/NBFT-Dell.PowerEdge.R660-fw1.5.5-single
@@ -36,6 +36,8 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=4105
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=0
+subsystem_ns_list[0]->unavailable=0
 subsystem_ns_list[1]->index=2
 subsystem_ns_list[1]->num_hfis=1
 subsystem_ns_list[1]->hfis[0]->index=1
@@ -52,3 +54,5 @@ subsystem_ns_list[1]->data_digest_required=0
 subsystem_ns_list[1]->controller_id=4105
 subsystem_ns_list[1]->asqsz=0
 subsystem_ns_list[1]->dhcp_root_path_string=(null)
+subsystem_ns_list[1]->discovered=0
+subsystem_ns_list[1]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-Dell.PowerEdge.R760 b/test/nbft/diffs/NBFT-Dell.PowerEdge.R760
index d7fab3f26938205388009d4e05c8badaac4cacf9..5bb854cd61e13fd3bfac1b1c9693c2334291aa11 100644 (file)
--- a/test/nbft/diffs/NBFT-Dell.PowerEdge.R760
+++ b/test/nbft/diffs/NBFT-Dell.PowerEdge.R760
@@ -41,6 +41,8 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=5
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=1
+subsystem_ns_list[0]->unavailable=0
 subsystem_ns_list[1]->index=2
 subsystem_ns_list[1]->discovery->index=1
 subsystem_ns_list[1]->num_hfis=1
@@ -58,3 +60,5 @@ subsystem_ns_list[1]->data_digest_required=0
 subsystem_ns_list[1]->controller_id=4166
 subsystem_ns_list[1]->asqsz=0
 subsystem_ns_list[1]->dhcp_root_path_string=(null)
+subsystem_ns_list[1]->discovered=1
+subsystem_ns_list[1]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-auto-ipv6 b/test/nbft/diffs/NBFT-auto-ipv6
index 83ee643042ef06965f428bbb1f1e630ebdf62244..4e198309457f1fe34dde2a008f016b3d13424eb2 100644 (file)
--- a/test/nbft/diffs/NBFT-auto-ipv6
+++ b/test/nbft/diffs/NBFT-auto-ipv6
@@ -36,3 +36,5 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=1
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=0
+subsystem_ns_list[0]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-dhcp-ipv4 b/test/nbft/diffs/NBFT-dhcp-ipv4
index 067079d92246b2b453d4c33fb11edcd48aa9c56d..4c9c61cb3dce4c76ee18a0a6d8a84c358340e75e 100644 (file)
--- a/test/nbft/diffs/NBFT-dhcp-ipv4
+++ b/test/nbft/diffs/NBFT-dhcp-ipv4
@@ -41,3 +41,5 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=7
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=1
+subsystem_ns_list[0]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-dhcp-ipv6 b/test/nbft/diffs/NBFT-dhcp-ipv6
index 11c974f67d6aeea5e699f92a0aa2ef50d56d220c..27c54fd7b90fd69fc6f852ddff6b35060240b7ba 100644 (file)
--- a/test/nbft/diffs/NBFT-dhcp-ipv6
+++ b/test/nbft/diffs/NBFT-dhcp-ipv6
@@ -36,3 +36,5 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=34
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=0
+subsystem_ns_list[0]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-rhpoc b/test/nbft/diffs/NBFT-rhpoc
index d849b6e1369a507263b8a16722726bd5d75c63ad..027ea4021a571494f940b5489a258b303caa800e 100644 (file)
--- a/test/nbft/diffs/NBFT-rhpoc
+++ b/test/nbft/diffs/NBFT-rhpoc
@@ -36,3 +36,5 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=12
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=0
+subsystem_ns_list[0]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-static-ipv4 b/test/nbft/diffs/NBFT-static-ipv4
index a6f38597ee7e19be10842b0e060add0f2b174570..697d0e537c1914ab971d09fcd527a945bd6f5c05 100644 (file)
--- a/test/nbft/diffs/NBFT-static-ipv4
+++ b/test/nbft/diffs/NBFT-static-ipv4
@@ -36,3 +36,5 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=38
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=0
+subsystem_ns_list[0]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-static-ipv4-discovery b/test/nbft/diffs/NBFT-static-ipv4-discovery
index 5bf0e46f2577b26530f111c5283763aafec9d171..22473a0dca5f9ac15e2c22fa97017cbdad383146 100644 (file)
--- a/test/nbft/diffs/NBFT-static-ipv4-discovery
+++ b/test/nbft/diffs/NBFT-static-ipv4-discovery
@@ -41,3 +41,5 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=13
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=1
+subsystem_ns_list[0]->unavailable=0

diff --git a/test/nbft/diffs/NBFT-static-ipv6 b/test/nbft/diffs/NBFT-static-ipv6
index c6ad844d954b64943769834a76df468f2d790ad5..12554f55f8fc2794a867e658e85437b1a180e2cf 100644 (file)
--- a/test/nbft/diffs/NBFT-static-ipv6
+++ b/test/nbft/diffs/NBFT-static-ipv6
@@ -36,3 +36,5 @@ subsystem_ns_list[0]->data_digest_required=0
 subsystem_ns_list[0]->controller_id=9
 subsystem_ns_list[0]->asqsz=0
 subsystem_ns_list[0]->dhcp_root_path_string=(null)
+subsystem_ns_list[0]->discovered=0
+subsystem_ns_list[0]->unavailable=0

diff --git a/test/nbft/nbft-dump.c b/test/nbft/nbft-dump.c
index 3ff5efa4bd5352735eca93ba6d88abb101b89b33..5fb2f2e9bfb916180740c5b41fac875aa850dd68 100644 (file)
--- a/test/nbft/nbft-dump.c
+++ b/test/nbft/nbft-dump.c
@@ -96,6 +96,8 @@ static void print_nbft(struct nbft_info *table)
                printf("subsystem_ns_list[%u]->controller_id=%d\n", i, (*ssns)->controller_id);
                printf("subsystem_ns_list[%u]->asqsz=%d\n", i, (*ssns)->asqsz);
                printf("subsystem_ns_list[%u]->dhcp_root_path_string=%s\n", i, (*ssns)->dhcp_root_path_string);
+               printf("subsystem_ns_list[%u]->discovered=%d\n", i, (*ssns)->discovered);
+               printf("subsystem_ns_list[%u]->unavailable=%d\n", i, (*ssns)->unavailable);
        }
 }