From 46391691a06be1d25e69a6c0c2f9523df6347bed Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 25 Apr 2024 16:50:38 +0200 Subject: [PATCH] tests: Add sample NBFT table with mpath IPv4+IPv6 discovery A sample table generated by latest EDK2 snapshot: - two HFIs: static IPv4 and static IPv6 - two boot attempts defined for each HFI (multipath) with the well-known discovery NQN - second NIC link down Result: - the first boot attempt properly discovered - the second boot attempt transformed in an SSNS record with the discovery NQN and marked as unavailable - two Discovery Descriptor records corresponding with the boot attempts and linked to corresponding SSNS records Signed-off-by: Tomas Bzatek --- test/nbft/diffs/NBFT-mpath+disc-ipv4+6_half | 141 +++++++++++++++++++ test/nbft/meson.build | 3 +- test/nbft/tables/NBFT-mpath+disc-ipv4+6_half | Bin 0 -> 1922 bytes 3 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 test/nbft/diffs/NBFT-mpath+disc-ipv4+6_half create mode 100644 test/nbft/tables/NBFT-mpath+disc-ipv4+6_half diff --git a/test/nbft/diffs/NBFT-mpath+disc-ipv4+6_half b/test/nbft/diffs/NBFT-mpath+disc-ipv4+6_half new file mode 100644 index 00000000..1e1d678c --- /dev/null +++ b/test/nbft/diffs/NBFT-mpath+disc-ipv4+6_half @@ -0,0 +1,141 @@ +raw_nbft_size=1922 +host.id=12345678abcdabcdabcd123456789012 +host.nqn=nqn.2014-08.org.nvmexpress:uuid:12345678-abcd-abcd-abcd-123456789012 +host.host_id_configured=1 +host.host_nqn_configured=1 +host.primary=0 +hfi_list[0]->index=1 +hfi_list[0]->transport=tcp +hfi_list[0]->tcp_info.pci_sbdf=24 +hfi_list[0]->tcp_info.mac_addr=5254072c5ae +hfi_list[0]->tcp_info.vlan=0 +hfi_list[0]->tcp_info.ip_origin=1 +hfi_list[0]->tcp_info.ipaddr=192.168.122.158 +hfi_list[0]->tcp_info.subnet_mask_prefix=24 +hfi_list[0]->tcp_info.gateway_ipaddr=0.0.0.0 +hfi_list[0]->tcp_info.route_metric=0 +hfi_list[0]->tcp_info.primary_dns_ipaddr=0.0.0.0 +hfi_list[0]->tcp_info.secondary_dns_ipaddr=0.0.0.0 +hfi_list[0]->tcp_info.dhcp_server_ipaddr= +hfi_list[0]->tcp_info.host_name=(null) +hfi_list[0]->tcp_info.this_hfi_is_default_route=1 +hfi_list[0]->tcp_info.dhcp_override=0 +hfi_list[1]->index=2 +hfi_list[1]->transport=tcp +hfi_list[1]->tcp_info.pci_sbdf=32 +hfi_list[1]->tcp_info.mac_addr=5254072c5af +hfi_list[1]->tcp_info.vlan=0 +hfi_list[1]->tcp_info.ip_origin=1 +hfi_list[1]->tcp_info.ipaddr=4321::bbbb:2 +hfi_list[1]->tcp_info.subnet_mask_prefix=0 +hfi_list[1]->tcp_info.gateway_ipaddr=:: +hfi_list[1]->tcp_info.route_metric=0 +hfi_list[1]->tcp_info.primary_dns_ipaddr=:: +hfi_list[1]->tcp_info.secondary_dns_ipaddr=:: +hfi_list[1]->tcp_info.dhcp_server_ipaddr= +hfi_list[1]->tcp_info.host_name=(null) +hfi_list[1]->tcp_info.this_hfi_is_default_route=1 +hfi_list[1]->tcp_info.dhcp_override=0 +discovery_list[0]->index=1 +discovery_list[0]->hfi->index=1 +discovery_list[0]->uri=nvme+tcp://192.168.122.1:4420/ +discovery_list[0]->nqn=nqn.2014-08.org.nvmexpress.discovery +discovery_list[1]->index=2 +discovery_list[1]->hfi->index=2 +discovery_list[1]->uri=nvme+tcp://[4321::BBBB:1]:4420/ +discovery_list[1]->nqn=nqn.2014-08.org.nvmexpress.discovery +subsystem_ns_list[0]->index=1 +subsystem_ns_list[0]->discovery->index=1 +subsystem_ns_list[0]->num_hfis=1 +subsystem_ns_list[0]->hfis[0]->index=1 +subsystem_ns_list[0]->transport=tcp +subsystem_ns_list[0]->traddr=192.168.122.1 +subsystem_ns_list[0]->trsvcid=4420 +subsystem_ns_list[0]->subsys_port_id=0 +subsystem_ns_list[0]->nsid=123 +subsystem_ns_list[0]->nid_type=3 +subsystem_ns_list[0]->nid=d592cdf3ffffffff84123fcf7d99df27 +subsystem_ns_list[0]->subsys_nqn=nqn.2014-08.org.nvmexpress.boot.poc:test-target +subsystem_ns_list[0]->pdu_header_digest_required=0 +subsystem_ns_list[0]->data_digest_required=0 +subsystem_ns_list[0]->controller_id=0 +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 +subsystem_ns_list[1]->hfis[0]->index=1 +subsystem_ns_list[1]->transport=tcp +subsystem_ns_list[1]->traddr=192.168.122.1 +subsystem_ns_list[1]->trsvcid=4420 +subsystem_ns_list[1]->subsys_port_id=0 +subsystem_ns_list[1]->nsid=201 +subsystem_ns_list[1]->nid_type=3 +subsystem_ns_list[1]->nid=9b9e1b6ea02c427fbdeb2a0be9cb945 +subsystem_ns_list[1]->subsys_nqn=nqn.2014-08.org.nvmexpress.boot.poc:test-target +subsystem_ns_list[1]->pdu_header_digest_required=0 +subsystem_ns_list[1]->data_digest_required=0 +subsystem_ns_list[1]->controller_id=0 +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 +subsystem_ns_list[2]->index=3 +subsystem_ns_list[2]->discovery->index=1 +subsystem_ns_list[2]->num_hfis=1 +subsystem_ns_list[2]->hfis[0]->index=1 +subsystem_ns_list[2]->transport=tcp +subsystem_ns_list[2]->traddr=192.168.122.1 +subsystem_ns_list[2]->trsvcid=4420 +subsystem_ns_list[2]->subsys_port_id=0 +subsystem_ns_list[2]->nsid=202 +subsystem_ns_list[2]->nid_type=3 +subsystem_ns_list[2]->nid=5353d4e551a40f492a563231b833c5 +subsystem_ns_list[2]->subsys_nqn=nqn.2014-08.org.nvmexpress.boot.poc:test-target +subsystem_ns_list[2]->pdu_header_digest_required=0 +subsystem_ns_list[2]->data_digest_required=0 +subsystem_ns_list[2]->controller_id=0 +subsystem_ns_list[2]->asqsz=0 +subsystem_ns_list[2]->dhcp_root_path_string=(null) +subsystem_ns_list[2]->discovered=1 +subsystem_ns_list[2]->unavailable=0 +subsystem_ns_list[3]->index=4 +subsystem_ns_list[3]->discovery->index=1 +subsystem_ns_list[3]->num_hfis=1 +subsystem_ns_list[3]->hfis[0]->index=1 +subsystem_ns_list[3]->transport=tcp +subsystem_ns_list[3]->traddr=192.168.122.1 +subsystem_ns_list[3]->trsvcid=4420 +subsystem_ns_list[3]->subsys_port_id=0 +subsystem_ns_list[3]->nsid=203 +subsystem_ns_list[3]->nid_type=3 +subsystem_ns_list[3]->nid=fb13e6ffac2940c0a988cb1c17d39f4b +subsystem_ns_list[3]->subsys_nqn=nqn.2014-08.org.nvmexpress.boot.poc:test-target +subsystem_ns_list[3]->pdu_header_digest_required=0 +subsystem_ns_list[3]->data_digest_required=0 +subsystem_ns_list[3]->controller_id=0 +subsystem_ns_list[3]->asqsz=0 +subsystem_ns_list[3]->dhcp_root_path_string=(null) +subsystem_ns_list[3]->discovered=1 +subsystem_ns_list[3]->unavailable=0 +subsystem_ns_list[4]->index=5 +subsystem_ns_list[4]->discovery->index=2 +subsystem_ns_list[4]->num_hfis=1 +subsystem_ns_list[4]->hfis[0]->index=2 +subsystem_ns_list[4]->transport=tcp +subsystem_ns_list[4]->traddr=4321::bbbb:1 +subsystem_ns_list[4]->trsvcid=4420 +subsystem_ns_list[4]->subsys_port_id=0 +subsystem_ns_list[4]->nsid=0 +subsystem_ns_list[4]->nid_type=0 +subsystem_ns_list[4]->nid=0000000000000000 +subsystem_ns_list[4]->subsys_nqn=nqn.2014-08.org.nvmexpress.discovery +subsystem_ns_list[4]->pdu_header_digest_required=0 +subsystem_ns_list[4]->data_digest_required=0 +subsystem_ns_list[4]->controller_id=0 +subsystem_ns_list[4]->asqsz=0 +subsystem_ns_list[4]->dhcp_root_path_string=(null) +subsystem_ns_list[4]->discovered=1 +subsystem_ns_list[4]->unavailable=1 diff --git a/test/nbft/meson.build b/test/nbft/meson.build index bf4c8949..7882df61 100644 --- a/test/nbft/meson.build +++ b/test/nbft/meson.build @@ -20,7 +20,8 @@ tables = [ 'NBFT-static-ipv6', 'NBFT-Dell.PowerEdge.R760', 'NBFT-Dell.PowerEdge.R660-fw1.5.5-single', - 'NBFT-Dell.PowerEdge.R660-fw1.5.5-mpath+discovery' + 'NBFT-Dell.PowerEdge.R660-fw1.5.5-mpath+discovery', + 'NBFT-mpath+disc-ipv4+6_half' ] tables_bad = [ diff --git a/test/nbft/tables/NBFT-mpath+disc-ipv4+6_half b/test/nbft/tables/NBFT-mpath+disc-ipv4+6_half new file mode 100644 index 0000000000000000000000000000000000000000..13333b19469ca5ad859408b76b86877d70f4d761 GIT binary patch literal 1922 zcmcgrO=uHA82x59X(?Vpda$Ty#DXol+3aSMY*LENCRqfbT2n=kqHPjOL6e%Kp(1D$27e`?tT%l|sm95fE({;#I8T6Q^bjc19I$48(eht_nuBb0Oa8C9e?0!~lYLXim(e?k9qf^J z8qN*i8EpW{)CR2C-)8xDLd`+PfPDWm-2Z#yeCd8`$JF?hnJpXN-rfi2BzQ(AfHGYJ z*6eSmF8+rIG!8WfJppq6wL_p6;2FIHHq$(?R{uK2Z^$<&ZKWpMv*s$}Iws&ww1e43 zJ!|l0p(PM8bR!xGN~Rt&B+c|{QaBt7OWs&a3!8qQ;twmWvRN<(PNrI7hNcHJ#VdI< z-6Ls{pehATB_KtWpr)%)uj-5XS}A=x?N&XCCV6ysCfn~$7fz*y2eYYME;KYWkPIoR zSM&J;y42g3NLGL~9`qRiBf6m?%6R;E=Q?kwN`TV(C_*y zA1*cc0t6CW=q)bb0TvM1UY;~LiDUmivAA1Cnx=YCgrAq!-IvMa-GiA#D4)vZrF?I; zKb5Bj)Ul#;tCw7>w6K2C;`&M3s->$AcDdHVuWFqf$R#p`RQ3!CY_Hbizx=LzVlX7j jN>Ftxe%-C8$RU1)@}J38XdKnNsuBtrh>+6rHzGd(ehnHB literal 0 HcmV?d00001