diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs
index 3115383d591f..a38d8f660a6d 100644
--- a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs
+++ b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs
@@ -94,7 +94,7 @@ public override void ExecuteCmdlet()
// If the device is being configured for the first time, validate that mandatory params
// for first setup have been provided
- if (!deviceDetails.DeviceProperties.IsConfigUpdated && !ValidParamsForFirstDeviceConfiguration(StorSimpleNetworkConfig, TimeZone))
+ if (!deviceDetails.DeviceProperties.IsConfigUpdated && !ValidParamsForFirstDeviceConfiguration(StorSimpleNetworkConfig, TimeZone, SecondaryDnsServer))
{
throw new ArgumentException(Resources.MandatoryParamsMissingForInitialDeviceConfiguration);
}
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml b/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml
index a04ed294e885..f3f99ef69e5f 100644
--- a/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml
+++ b/src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml
@@ -94,5 +94,171 @@
+
+ Microsoft.WindowsAzure.Management.StorSimple.Models.AccessControlRecord
+
+ Microsoft.WindowsAzure.Management.StorSimple.Models.AccessControlRecord
+
+
+
+
+
+ 36
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ InstanceId
+
+
+ Name
+
+
+ InitiatorName
+
+
+ VolumeCount
+
+
+
+
+
+
+
+ Microsoft.WindowsAzure.Commands.StorSimple.ResourceCredentials
+
+ Microsoft.WindowsAzure.Commands.StorSimple.ResourceCredentials
+
+
+
+
+
+
+
+
+ 20
+
+
+
+
+
+
+
+
+
+ ResourceName
+
+
+ ResourceId
+
+
+ ResourceState
+
+
+
+
+
+
+
+ Microsoft.WindowsAzure.Commands.StorSimple.StorSimpleResourceContext
+
+ Microsoft.WindowsAzure.Commands.StorSimple.StorSimpleResourceContext
+
+
+
+
+
+ 20
+
+
+
+
+
+
+
+
+
+ ResourceId
+
+
+ ResourceName
+
+
+
+
+
+
+
+ Microsoft.WindowsAzure.Management.StorSimple.Models.StorageAccountCredentialResponse
+
+ Microsoft.WindowsAzure.Management.StorSimple.Models.StorageAccountCredentialResponse
+
+
+
+
+
+ 36
+
+
+
+
+
+
+
+
+
+ 6
+
+
+
+
+
+
+ 12
+
+
+
+
+
+
+
+
+
+ InstanceId
+
+
+ Login
+
+
+ Name
+
+
+ UseSSL
+
+
+ VolumeCount
+
+
+ CloudType
+
+
+ Location
+
+
+
+
+
+
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs
index b45f0380ea8a..b9c0729932be 100644
--- a/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs
+++ b/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs
@@ -473,7 +473,7 @@ internal void TrySetIPAddress(string data, out IPAddress ipAddress, string param
/// Validate that all mandatory data for the first Device Configuration has been provided.
///
/// bool indicating whether all mandatory data is there or not.
- internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs, TimeZoneInfo timeZone)
+ internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs, TimeZoneInfo timeZone, string secondaryDnsServer)
{
if (netConfigs == null)
{
@@ -486,7 +486,7 @@ internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs,
return false;
}
// Timezone is also mandatory
- if (timeZone == null)
+ if (timeZone == null || secondaryDnsServer == null)
{
return false;
}