Re: [Patch] NetworkPkg/IScsiDxe: Display InitiatorInfo in attempt page even DHCP enabled.

[Karunakar P <karunakarp@amiindia.co.in>]

Hi Jiaxin/Siyuan,

I've verified Initiator details with this changes.

I found an issue like Initiator Details are shown for Connection less NIC 

Please find below details for more details

[Issue details and steps to reproduce]
1. SUT have 2 LAN ports
  MAC  XX:XX:XX:XX:XX:AA  ->       LAN Cable NOT connected to this port, i.e. Link Status is Disconnected
  MAC  XX:XX:XX:XX:XX:BB  ->       LAN Cable Connected to this port,  i.e. Link Status is Connected

2. I've added two attempts
   a. Attempt1 added to connection less NIC (MAC  XX:XX:XX:XX:XX:AA  )
   b. Attempt2 added to connected NIC (MAC  XX:XX:XX:XX:XX:BB  )

[Observations]
1. Initiator IP Address and Subnet Mask displayed for both Attempt1 and Attempt2

Could you please comment on this observation?

Thanks,
Karunakar

-----Original Message-----
From: Fu, Siyuan [mailto:siyuan.fu@intel.com] 
Sent: Friday, October 13, 2017 11:54 AM
To: Wu, Jiaxin; edk2-devel@lists.01.org
Cc: Karunakar P; Ye, Ting
Subject: RE: [Patch] NetworkPkg/IScsiDxe: Display InitiatorInfo in attempt page even DHCP enabled.

Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

-----Original Message-----
From: Wu, Jiaxin 
Sent: Friday, October 13, 2017 2:01 PM
To: edk2-devel@lists.01.org
Cc: Karunakar P <karunakarp@amiindia.co.in>; Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
Subject: [Patch] NetworkPkg/IScsiDxe: Display InitiatorInfo in attempt page even DHCP enabled.

Cc: Karunakar P <karunakarp@amiindia.co.in>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index d401419..35e8f9a 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -189,13 +189,14 @@ formset
             flags  = INTERACTIVE,
             key    = KEY_DHCP_ENABLE,
     endcheckbox;
     endif;
 
-    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01 OR
-               ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_IP6 OR 
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_IP6 OR 
                ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_AUTOCONFIG;
+               
+    grayoutif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
             flags   = INTERACTIVE,
             key     = KEY_LOCAL_IP,
@@ -218,10 +219,11 @@ formset
             flags   = INTERACTIVE,
             key     = KEY_GATE_WAY,
             minsize = IP4_MIN_SIZE,
             maxsize = IP4_MAX_SIZE,
     endstring;
+    endif;
     
     endif;
 
     suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_AUTOCONFIG;
     subtitle text = STRING_TOKEN(STR_NULL);
-- 
1.9.5.msysgit.1