Skip to content

Commit 06e4e68

Browse files
author
Sankaranarayanan Mahadevan
committed
Fix for bug 2239174: Fixing secondaryDNS server to make it non mandatory.
1 parent c642f41 commit 06e4e68

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public override void ExecuteCmdlet()
9494

9595
// If the device is being configured for the first time, validate that mandatory params
9696
// for first setup have been provided
97-
if (!deviceDetails.DeviceProperties.IsConfigUpdated && !ValidParamsForFirstDeviceConfiguration(StorSimpleNetworkConfig, TimeZone, SecondaryDnsServer))
97+
if (!deviceDetails.DeviceProperties.IsConfigUpdated && !ValidParamsForFirstDeviceConfiguration(StorSimpleNetworkConfig, TimeZone))
9898
{
9999
throw new ArgumentException(Resources.MandatoryParamsMissingForInitialDeviceConfiguration);
100100
}

src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
<value>Could not persist secret</value>
416416
</data>
417417
<data name="DeviceNotConfiguredMessage" xml:space="preserve">
418-
<value>The device name is not fully configured. Please complete the configuration and retry.</value>
418+
<value>The device with the specified device name is not fully configured. Please complete the configuration and retry.</value>
419419
</data>
420420
<data name="DeviceNotRegisteredMessage" xml:space="preserve">
421421
<value>No StorSimple device is currently registered with this resource. Please register at least one device with the resource and then rerun this command.</value>

src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ internal void TrySetIPAddress(string data, out IPAddress ipAddress, string param
473473
/// Validate that all mandatory data for the first Device Configuration has been provided.
474474
/// </summary>
475475
/// <returns>bool indicating whether all mandatory data is there or not.</returns>
476-
internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs, TimeZoneInfo timeZone, string secondaryDnsServer)
476+
internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs, TimeZoneInfo timeZone)
477477
{
478478
if (netConfigs == null)
479479
{
@@ -485,8 +485,8 @@ internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs,
485485
{
486486
return false;
487487
}
488-
// Timezone and Secondary Dns Server are also mandatory
489-
if (timeZone == null || string.IsNullOrEmpty(secondaryDnsServer))
488+
// Timezone is also mandatory
489+
if (timeZone == null)
490490
{
491491
return false;
492492
}

0 commit comments

Comments
 (0)