public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-test][Patch] uefi-sct/SctPkg:The Lun display order issue in iSCSI device path text
@ 2018-11-02  8:08 Eric Jin
  2018-11-07 20:18 ` Supreeth Venkatesh
  0 siblings, 1 reply; 2+ messages in thread
From: Eric Jin @ 2018-11-02  8:08 UTC (permalink / raw)
  To: edk2-devel

The LUN is an 8 byte array that is displayed in hexadecimal
format with byte 0 first (i.e., on the left) and byte 7 last
(i.e, on the right).

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Jin <eric.jin@intel.com>
---
 .../BlackBoxTest/DevicePathFromTextBBTestCoverage.c         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
index fc099d8..96cd84f 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
@@ -1,7 +1,7 @@
 /** @file
 
   Copyright 2006 - 2017 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -1445,6 +1445,7 @@ CreateiScsiDeviceNode (
   UINT64                      LunNum;
   ISCSI_DEVICE_PATH_WITH_NAME *iSCSI;
 
+  LunNum            = 0;
   NameStr           = SctSplitStr (&TextDeviceNode, L',');
   PortalGroupStr    = SctSplitStr (&TextDeviceNode, L',');
   LunStr            = SctSplitStr (&TextDeviceNode, L',');
@@ -1459,7 +1460,7 @@ CreateiScsiDeviceNode (
                                                         );
   SctUnicodeToAscii (iSCSI->iSCSITargetName, NameStr, SctStrLen (NameStr));
   iSCSI->TargetPortalGroupTag = (UINT16) SctStrToUInt (PortalGroupStr);
-  SctStrToUInt64 (LunStr, &LunNum);
+  StrToUInt8Array(LunStr, &LunNum);
   iSCSI->Lun = LunNum;
 
   Options = 0x0000;
@@ -2846,12 +2847,12 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
                 (UINTN)__LINE__
                 );
   //
-  // TDS 3.10.1.2.26
+  // TDS 3.10.1.2.26   In Lun 0x0000005678000000, byte 3 is 0x56 and byte4 is 0x78
   //
-  SctStrCpy (text, L"MyTargetName,0x12AB,5678,CRC32C,None,CHAP_BI,TCP");
+  SctStrCpy (text, L"MyTargetName,0x12AB,0x0000005678000000,CRC32C,None,CHAP_BI,TCP");
   pDevicePath = CreateiScsiDeviceNode(text);
 
-  SctStrCpy (text, L"iSCSI(MyTargetName,0x12AB,5678,CRC32C,None,CHAP_BI,TCP)");
+  SctStrCpy (text, L"iSCSI(MyTargetName,0x12AB,0x0000005678000000,CRC32C,None,CHAP_BI,TCP)");
   pReDevicePath = DevicePathFromText->ConvertTextToDeviceNode (text);
   if (SctCompareMem (pDevicePath, pReDevicePath, SctDevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) pReDevicePath)) == 0) {
     AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -2866,7 +2867,7 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
                 AssertionType,
                 gDevicePathFromTextBBTestFunctionAssertionGuid114,
                 L"EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL - ConvertDeviceNodeToText must correctly recover the converting ConvertTextToDeviceNode has acted on the device node string",
-                L"%a:%d, Convert iSCSI(MyTargetName,0x12AB,5678,CRC32C,None,CHAP_BI,TCP)",
+                L"%a:%d, Convert iSCSI(MyTargetName,0x12AB,0x0000005678000000,CRC32C,None,CHAP_BI,TCP)",
                 __FILE__,
                 (UINTN)__LINE__
                 );
-- 
2.9.0.windows.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [edk2-test][Patch] uefi-sct/SctPkg:The Lun display order issue in iSCSI device path text
  2018-11-02  8:08 [edk2-test][Patch] uefi-sct/SctPkg:The Lun display order issue in iSCSI device path text Eric Jin
@ 2018-11-07 20:18 ` Supreeth Venkatesh
  0 siblings, 0 replies; 2+ messages in thread
From: Supreeth Venkatesh @ 2018-11-07 20:18 UTC (permalink / raw)
  To: Eric Jin, edk2-devel@lists.01.org

Thanks.

Reviewed-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>

On Fri, 2018-11-02 at 03:08 -0500, Eric Jin wrote:
> The LUN is an 8 byte array that is displayed in hexadecimal
> format with byte 0 first (i.e., on the left) and byte 7 last
> (i.e, on the right).
> 
> Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Jin <eric.jin@intel.com>
> ---
>  .../BlackBoxTest/DevicePathFromTextBBTestCoverage.c         | 13
> +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/uefi-
> sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
> /DevicePathFromTextBBTestCoverage.c b/uefi-
> sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
> /DevicePathFromTextBBTestCoverage.c
> index fc099d8..96cd84f 100644
> --- a/uefi-
> sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
> /DevicePathFromTextBBTestCoverage.c
> +++ b/uefi-
> sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
> /DevicePathFromTextBBTestCoverage.c
> @@ -1,7 +1,7 @@
>  /** @file
>  
>    Copyright 2006 - 2017 Unified EFI, Inc.<BR>
> -  Copyright (c) 2010 - 2017, Intel Corporation. All rights
> reserved.<BR>
> +  Copyright (c) 2010 - 2018, Intel Corporation. All rights
> reserved.<BR>
>  
>    This program and the accompanying materials
>    are licensed and made available under the terms and conditions of
> the BSD License
> @@ -1445,6 +1445,7 @@ CreateiScsiDeviceNode (
>    UINT64                      LunNum;
>    ISCSI_DEVICE_PATH_WITH_NAME *iSCSI;
>  
> +  LunNum            = 0;
>    NameStr           = SctSplitStr (&TextDeviceNode, L',');
>    PortalGroupStr    = SctSplitStr (&TextDeviceNode, L',');
>    LunStr            = SctSplitStr (&TextDeviceNode, L',');
> @@ -1459,7 +1460,7 @@ CreateiScsiDeviceNode (
>                                                          );
>    SctUnicodeToAscii (iSCSI->iSCSITargetName, NameStr, SctStrLen
> (NameStr));
>    iSCSI->TargetPortalGroupTag = (UINT16) SctStrToUInt
> (PortalGroupStr);
> -  SctStrToUInt64 (LunStr, &LunNum);
> +  StrToUInt8Array(LunStr, &LunNum);
>    iSCSI->Lun = LunNum;
>  
>    Options = 0x0000;
> @@ -2846,12 +2847,12 @@
> DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
>                  (UINTN)__LINE__
>                  );
>    //
> -  // TDS 3.10.1.2.26
> +  // TDS 3.10.1.2.26   In Lun 0x0000005678000000, byte 3 is 0x56 and
> byte4 is 0x78
>    //
> -  SctStrCpy (text,
> L"MyTargetName,0x12AB,5678,CRC32C,None,CHAP_BI,TCP");
> +  SctStrCpy (text,
> L"MyTargetName,0x12AB,0x0000005678000000,CRC32C,None,CHAP_BI,TCP");
>    pDevicePath = CreateiScsiDeviceNode(text);
>  
> -  SctStrCpy (text,
> L"iSCSI(MyTargetName,0x12AB,5678,CRC32C,None,CHAP_BI,TCP)");
> +  SctStrCpy (text,
> L"iSCSI(MyTargetName,0x12AB,0x0000005678000000,CRC32C,None,CHAP_BI,TC
> P)");
>    pReDevicePath = DevicePathFromText->ConvertTextToDeviceNode
> (text);
>    if (SctCompareMem (pDevicePath, pReDevicePath,
> SctDevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) pReDevicePath))
> == 0) {
>      AssertionType = EFI_TEST_ASSERTION_PASSED;
> @@ -2866,7 +2867,7 @@
> DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
>                  AssertionType,
>                  gDevicePathFromTextBBTestFunctionAssertionGuid114,
>                  L"EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL -
> ConvertDeviceNodeToText must correctly recover the converting
> ConvertTextToDeviceNode has acted on the device node string",
> -                L"%a:%d, Convert
> iSCSI(MyTargetName,0x12AB,5678,CRC32C,None,CHAP_BI,TCP)",
> +                L"%a:%d, Convert
> iSCSI(MyTargetName,0x12AB,0x0000005678000000,CRC32C,None,CHAP_BI,TCP)
> ",
>                  __FILE__,
>                  (UINTN)__LINE__
>                  );



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-11-07 20:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-02  8:08 [edk2-test][Patch] uefi-sct/SctPkg:The Lun display order issue in iSCSI device path text Eric Jin
2018-11-07 20:18 ` Supreeth Venkatesh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox