Skip to content

Commit 6d7dcc0

Browse files
parvezahparvezah
committed
Merge pull request #46 from AzCiS/sanmah
Reverting changes for SecondaryDNS.
2 parents 21f4676 + fc997e7 commit 6d7dcc0

File tree

3 files changed

+169
-3
lines changed

3 files changed

+169
-3
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))
97+
if (!deviceDetails.DeviceProperties.IsConfigUpdated && !ValidParamsForFirstDeviceConfiguration(StorSimpleNetworkConfig, TimeZone, SecondaryDnsServer))
9898
{
9999
throw new ArgumentException(Resources.MandatoryParamsMissingForInitialDeviceConfiguration);
100100
}

‎src/ServiceManagement/StorSimple/Commands.StorSimple/Microsoft.WindowsAzure.Commands.StorSimple.format.ps1xml

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,171 @@
9494
</TableRowEntries>
9595
</TableControl>
9696
</View>
97+
<View>
98+
<Name>Microsoft.WindowsAzure.Management.StorSimple.Models.AccessControlRecord</Name>
99+
<ViewSelectedBy>
100+
<TypeName>Microsoft.WindowsAzure.Management.StorSimple.Models.AccessControlRecord</TypeName>
101+
</ViewSelectedBy>
102+
<TableControl>
103+
<TableHeaders>
104+
<TableColumnHeader>
105+
<Label>InstanceId</Label>
106+
<Width>36</Width>
107+
</TableColumnHeader>
108+
<TableColumnHeader>
109+
<Label>Name</Label>
110+
</TableColumnHeader>
111+
<TableColumnHeader>
112+
<Label>InitiatorName</Label>
113+
</TableColumnHeader>
114+
<TableColumnHeader>
115+
<Label>VolumeCount</Label>
116+
</TableColumnHeader>
117+
</TableHeaders>
118+
<TableRowEntries>
119+
<TableRowEntry>
120+
<TableColumnItems>
121+
<TableColumnItem>
122+
<PropertyName>InstanceId</PropertyName>
123+
</TableColumnItem>
124+
<TableColumnItem>
125+
<PropertyName>Name</PropertyName>
126+
</TableColumnItem>
127+
<TableColumnItem>
128+
<PropertyName>InitiatorName</PropertyName>
129+
</TableColumnItem>
130+
<TableColumnItem>
131+
<PropertyName>VolumeCount</PropertyName>
132+
</TableColumnItem>
133+
</TableColumnItems>
134+
</TableRowEntry>
135+
</TableRowEntries>
136+
</TableControl>
137+
</View>
138+
<View>
139+
<Name>Microsoft.WindowsAzure.Commands.StorSimple.ResourceCredentials</Name>
140+
<ViewSelectedBy>
141+
<TypeName>Microsoft.WindowsAzure.Commands.StorSimple.ResourceCredentials</TypeName>
142+
</ViewSelectedBy>
143+
<TableControl>
144+
<TableHeaders>
145+
<TableColumnHeader>
146+
<Label>ResourceName</Label>
147+
</TableColumnHeader>
148+
<TableColumnHeader>
149+
<Label>ResourceId</Label>
150+
<Width>20</Width>
151+
</TableColumnHeader>
152+
<TableColumnHeader>
153+
<Label>ResourceState</Label>
154+
</TableColumnHeader>
155+
</TableHeaders>
156+
<TableRowEntries>
157+
<TableRowEntry>
158+
<TableColumnItems>
159+
<TableColumnItem>
160+
<PropertyName>ResourceName</PropertyName>
161+
</TableColumnItem>
162+
<TableColumnItem>
163+
<PropertyName>ResourceId</PropertyName>
164+
</TableColumnItem>
165+
<TableColumnItem>
166+
<PropertyName>ResourceState</PropertyName>
167+
</TableColumnItem>
168+
</TableColumnItems>
169+
</TableRowEntry>
170+
</TableRowEntries>
171+
</TableControl>
172+
</View>
173+
<View>
174+
<Name>Microsoft.WindowsAzure.Commands.StorSimple.StorSimpleResourceContext</Name>
175+
<ViewSelectedBy>
176+
<TypeName>Microsoft.WindowsAzure.Commands.StorSimple.StorSimpleResourceContext</TypeName>
177+
</ViewSelectedBy>
178+
<TableControl>
179+
<TableHeaders>
180+
<TableColumnHeader>
181+
<Label>ResourceId</Label>
182+
<Width>20</Width>
183+
</TableColumnHeader>
184+
<TableColumnHeader>
185+
<Label>ResourceName</Label>
186+
</TableColumnHeader>
187+
</TableHeaders>
188+
<TableRowEntries>
189+
<TableRowEntry>
190+
<TableColumnItems>
191+
<TableColumnItem>
192+
<PropertyName>ResourceId</PropertyName>
193+
</TableColumnItem>
194+
<TableColumnItem>
195+
<PropertyName>ResourceName</PropertyName>
196+
</TableColumnItem>
197+
</TableColumnItems>
198+
</TableRowEntry>
199+
</TableRowEntries>
200+
</TableControl>
201+
</View>
202+
<View>
203+
<Name>Microsoft.WindowsAzure.Management.StorSimple.Models.StorageAccountCredentialResponse</Name>
204+
<ViewSelectedBy>
205+
<TypeName>Microsoft.WindowsAzure.Management.StorSimple.Models.StorageAccountCredentialResponse</TypeName>
206+
</ViewSelectedBy>
207+
<TableControl>
208+
<TableHeaders>
209+
<TableColumnHeader>
210+
<Label>InstanceId</Label>
211+
<Width>36</Width>
212+
</TableColumnHeader>
213+
<TableColumnHeader>
214+
<Label>Login</Label>
215+
</TableColumnHeader>
216+
<TableColumnHeader>
217+
<Label>Name</Label>
218+
</TableColumnHeader>
219+
<TableColumnHeader>
220+
<Label>UseSSL</Label>
221+
<Width>6</Width>
222+
</TableColumnHeader>
223+
<TableColumnHeader>
224+
<Label>VolumeCount</Label>
225+
</TableColumnHeader>
226+
<TableColumnHeader>
227+
<Label>CloudType</Label>
228+
<Width>12</Width>
229+
</TableColumnHeader>
230+
<TableColumnHeader>
231+
<Label>Location</Label>
232+
</TableColumnHeader>
233+
</TableHeaders>
234+
<TableRowEntries>
235+
<TableRowEntry>
236+
<TableColumnItems>
237+
<TableColumnItem>
238+
<PropertyName>InstanceId</PropertyName>
239+
</TableColumnItem>
240+
<TableColumnItem>
241+
<PropertyName>Login</PropertyName>
242+
</TableColumnItem>
243+
<TableColumnItem>
244+
<PropertyName>Name</PropertyName>
245+
</TableColumnItem>
246+
<TableColumnItem>
247+
<PropertyName>UseSSL</PropertyName>
248+
</TableColumnItem>
249+
<TableColumnItem>
250+
<PropertyName>VolumeCount</PropertyName>
251+
</TableColumnItem>
252+
<TableColumnItem>
253+
<PropertyName>CloudType</PropertyName>
254+
</TableColumnItem>
255+
<TableColumnItem>
256+
<PropertyName>Location</PropertyName>
257+
</TableColumnItem>
258+
</TableColumnItems>
259+
</TableRowEntry>
260+
</TableRowEntries>
261+
</TableControl>
262+
</View>
97263
</ViewDefinitions>
98264
</Configuration>

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

Lines changed: 2 additions & 2 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)
476+
internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs, TimeZoneInfo timeZone, string secondaryDnsServer)
477477
{
478478
if (netConfigs == null)
479479
{
@@ -486,7 +486,7 @@ internal bool ValidParamsForFirstDeviceConfiguration(NetworkConfig[] netConfigs,
486486
return false;
487487
}
488488
// Timezone is also mandatory
489-
if (timeZone == null)
489+
if (timeZone == null || secondaryDnsServer == null)
490490
{
491491
return false;
492492
}

0 commit comments

Comments
 (0)