Skip to content

Commit

Permalink
Merge pull request #46 from AzCiS/sanmah
Browse files Browse the repository at this point in the history 
Reverting changes for SecondaryDNS.
  • Loading branch information
@parvezah
parvezah committed Apr 10, 2015
2 parents 21f4676 + fc997e7 commit 6d7dcc0
Show file tree
Hide file tree
Showing 3 changed files with 169 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ...nagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
166 changes: 166 additions & 0 deletions ...t/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,171 @@
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.WindowsAzure.Management.StorSimple.Models.AccessControlRecord</Name>
<ViewSelectedBy>
<TypeName>Microsoft.WindowsAzure.Management.StorSimple.Models.AccessControlRecord</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>InstanceId</Label>
<Width>36</Width>
</TableColumnHeader>
<TableColumnHeader>
<Label>Name</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>InitiatorName</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>VolumeCount</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>InstanceId</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Name</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>InitiatorName</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>VolumeCount</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.WindowsAzure.Commands.StorSimple.ResourceCredentials</Name>
<ViewSelectedBy>
<TypeName>Microsoft.WindowsAzure.Commands.StorSimple.ResourceCredentials</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>ResourceName</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>ResourceId</Label>
<Width>20</Width>
</TableColumnHeader>
<TableColumnHeader>
<Label>ResourceState</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>ResourceName</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>ResourceId</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>ResourceState</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.WindowsAzure.Commands.StorSimple.StorSimpleResourceContext</Name>
<ViewSelectedBy>
<TypeName>Microsoft.WindowsAzure.Commands.StorSimple.StorSimpleResourceContext</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>ResourceId</Label>
<Width>20</Width>
</TableColumnHeader>
<TableColumnHeader>
<Label>ResourceName</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>ResourceId</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>ResourceName</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>Microsoft.WindowsAzure.Management.StorSimple.Models.StorageAccountCredentialResponse</Name>
<ViewSelectedBy>
<TypeName>Microsoft.WindowsAzure.Management.StorSimple.Models.StorageAccountCredentialResponse</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Label>InstanceId</Label>
<Width>36</Width>
</TableColumnHeader>
<TableColumnHeader>
<Label>Login</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>Name</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>UseSSL</Label>
<Width>6</Width>
</TableColumnHeader>
<TableColumnHeader>
<Label>VolumeCount</Label>
</TableColumnHeader>
<TableColumnHeader>
<Label>CloudType</Label>
<Width>12</Width>
</TableColumnHeader>
<TableColumnHeader>
<Label>Location</Label>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<TableColumnItems>
<TableColumnItem>
<PropertyName>InstanceId</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Login</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Name</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>UseSSL</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>VolumeCount</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>CloudType</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Location</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
</ViewDefinitions>
</Configuration>
4 changes: 2 additions & 2 deletions src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
/// </summary>
/// <returns>bool indicating whether all mandatory data is there or not.</returns>
internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs, TimeZoneInfo timeZone)
internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs, TimeZoneInfo timeZone, string secondaryDnsServer)
{
if (netConfigs == null)
{
Expand All @@ -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;
}
Expand Down

0 comments on commit 6d7dcc0

Please sign in to comment.