Skip to content

Commit a4b5fde

Browse files
vladcavladca
committed
Merge pull request #2 from levhayr/ignite_team
Update DNS cmdlet code to use the SDK 1.1.1-preview
2 parents 8cadd6b + e4b2c64 commit a4b5fde

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</Reference>
102102
<Reference Include="Microsoft.Azure.Management.Dns, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.1.1.0-preview\lib\net40\Microsoft.Azure.Management.Dns.dll</HintPath>
104+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.1.1.1-preview\lib\net40\Microsoft.Azure.Management.Dns.dll</HintPath>
105105
</Reference>
106106
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107107
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎src/ResourceManager/Dns/Commands.Dns/Models/DnsClient.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -144,22 +144,22 @@ public List<DnsZone> ListDnsZones(string resourceGroupName, string endsWith)
144144
.ToList();
145145
}
146146

147-
public DnsRecordSet CreateDnsRecordSet(string zoneName, string resourceGroupName, string relativeRecordName, uint ttl, RecordType recordType, Hashtable[] tags, bool overwrite)
147+
public DnsRecordSet CreateDnsRecordSet(string zoneName, string resourceGroupName, string relativeRecordSetName, uint ttl, RecordType recordType, Hashtable[] tags, bool overwrite)
148148
{
149-
RecordCreateOrUpdateResponse response = this.DnsManagementClient.Records.CreateOrUpdate(
149+
RecordSetCreateOrUpdateResponse response = this.DnsManagementClient.RecordSets.CreateOrUpdate(
150150
resourceGroupName,
151151
zoneName,
152-
relativeRecordName,
152+
relativeRecordSetName,
153153
recordType,
154-
new RecordCreateOrUpdateParameters
154+
new RecordSetCreateOrUpdateParameters
155155
{
156156
IfNoneMatch = overwrite ? null : "*",
157157
RecordSet = new RecordSet
158158
{
159-
Name = relativeRecordName,
159+
Name = relativeRecordSetName,
160160
Location = DnsResourceLocation,
161161
Tags = TagsConversionHelper.CreateTagDictionary(tags, validate: true),
162-
Properties = new RecordProperties
162+
Properties = new RecordSetProperties
163163
{
164164
ETag = null,
165165
Ttl = ttl,
@@ -181,20 +181,20 @@ public DnsRecordSet CreateDnsRecordSet(string zoneName, string resourceGroupName
181181

182182
public DnsRecordSet UpdateDnsRecordSet(DnsRecordSet recordSet, bool ignoreEtag)
183183
{
184-
RecordCreateOrUpdateResponse response = this.DnsManagementClient.Records.CreateOrUpdate(
184+
RecordSetCreateOrUpdateResponse response = this.DnsManagementClient.RecordSets.CreateOrUpdate(
185185
recordSet.ResourceGroupName,
186186
recordSet.ZoneName,
187187
recordSet.Name,
188188
recordSet.RecordType,
189-
new RecordCreateOrUpdateParameters
189+
new RecordSetCreateOrUpdateParameters
190190
{
191191
IfNoneMatch = null,
192192
RecordSet = new RecordSet
193193
{
194194
Name = recordSet.Name,
195195
Location = DnsResourceLocation,
196196
Tags = TagsConversionHelper.CreateTagDictionary(recordSet.Tags, validate: true),
197-
Properties = new RecordProperties
197+
Properties = new RecordSetProperties
198198
{
199199
ETag = ignoreEtag ? "*" : recordSet.Etag,
200200
Ttl = recordSet.Ttl,
@@ -215,12 +215,12 @@ public DnsRecordSet UpdateDnsRecordSet(DnsRecordSet recordSet, bool ignoreEtag)
215215

216216
public bool DeleteDnsRecordSet(DnsRecordSet recordSet, bool ignoreEtag)
217217
{
218-
AzureOperationResponse response = this.DnsManagementClient.Records.Delete(
218+
AzureOperationResponse response = this.DnsManagementClient.RecordSets.Delete(
219219
recordSet.ResourceGroupName,
220220
recordSet.ZoneName,
221221
recordSet.Name,
222222
recordSet.RecordType,
223-
new RecordDeleteParameters
223+
new RecordSetDeleteParameters
224224
{
225225
IfMatch = ignoreEtag ? "*" : recordSet.Etag
226226
});
@@ -230,18 +230,18 @@ public bool DeleteDnsRecordSet(DnsRecordSet recordSet, bool ignoreEtag)
230230

231231
public DnsRecordSet GetDnsRecordSet(string name, string zoneName, string resourceGroupName, RecordType recordType)
232232
{
233-
RecordGetResponse getResponse = this.DnsManagementClient.Records.Get(resourceGroupName, zoneName, name, recordType);
233+
RecordSetGetResponse getResponse = this.DnsManagementClient.RecordSets.Get(resourceGroupName, zoneName, name, recordType);
234234
return GetPowerShellRecordSet(zoneName, resourceGroupName, getResponse.RecordSet);
235235
}
236236

237237
public List<DnsRecordSet> ListRecordSets(string zoneName, string resourceGroupName, RecordType recordType, string endsWith)
238238
{
239-
RecordListParameters recordListParameters = new RecordListParameters
239+
RecordSetListParameters recordListParameters = new RecordSetListParameters
240240
{
241241
Filter = endsWith == null ? null : string.Format("endswith(Name,'{0}')", endsWith)
242242
};
243243

244-
RecordListResponse listResponse = this.DnsManagementClient.Records.List(resourceGroupName, zoneName, recordType, recordListParameters);
244+
RecordSetListResponse listResponse = this.DnsManagementClient.RecordSets.List(resourceGroupName, zoneName, recordType, recordListParameters);
245245
return listResponse
246246
.RecordSets
247247
.Select(recordSetInResponse => GetPowerShellRecordSet(zoneName, resourceGroupName, recordSetInResponse))
@@ -250,12 +250,12 @@ public List<DnsRecordSet> ListRecordSets(string zoneName, string resourceGroupNa
250250

251251
public List<DnsRecordSet> ListRecordSets(string zoneName, string resourceGroupName, string endsWith)
252252
{
253-
RecordListParameters recordListParameters = new RecordListParameters
253+
RecordSetListParameters recordListParameters = new RecordSetListParameters
254254
{
255255
Filter = endsWith == null ? null : string.Format("endswith(Name,'{0}')", endsWith)
256256
};
257257

258-
RecordListResponse listResponse = this.DnsManagementClient.Records.ListAll(resourceGroupName, zoneName, recordListParameters);
258+
RecordSetListResponse listResponse = this.DnsManagementClient.RecordSets.ListAll(resourceGroupName, zoneName, recordListParameters);
259259
return listResponse
260260
.RecordSets
261261
.Select(recordSetInResponse => GetPowerShellRecordSet(zoneName, resourceGroupName, recordSetInResponse))
@@ -264,7 +264,7 @@ public List<DnsRecordSet> ListRecordSets(string zoneName, string resourceGroupNa
264264

265265
private static DnsRecordSet GetPowerShellRecordSet(string zoneName, string resourceGroupName, Management.Dns.Models.RecordSet mamlRecordSet)
266266
{
267-
// e.g. "/subscriptions/<guid>/resourceGroups/<rg>/providers/microsoft.dns/dnszones/<zone>/A/<record>"
267+
// e.g. "/subscriptions/<guid>/resourceGroups/<rg>/providers/microsoft.dns/dnszones/<zone>/A/<recordset>"
268268
string recordTypeAsString = mamlRecordSet.Id.Split('/').Reverse().Skip(1).First();
269269

270270
RecordType recordType = (RecordType)Enum.Parse(typeof(RecordType), recordTypeAsString, ignoreCase: true);

‎src/ResourceManager/Dns/Commands.Dns/Records/RemoveAzureDnsRecordConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.Dns
2828
[Cmdlet(VerbsCommon.Remove, "AzureDnsRecordConfig"), OutputType(typeof(DnsRecordSet))]
2929
public class RemoveAzureDnsRecordConfig : DnsBaseCmdlet
3030
{
31-
[Parameter(Mandatory = true, ValueFromPipeline = true, HelpMessage = "The record set in which to add the record.")]
31+
[Parameter(Mandatory = true, ValueFromPipeline = true, HelpMessage = "The record set from which to remove the record.")]
3232
[ValidateNotNullOrEmpty]
3333
public DnsRecordSet RecordSet { get; set; }
3434

‎src/ResourceManager/Dns/Commands.Dns/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.21-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Dns" version="1.1.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Dns" version="1.1.1-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎tools/LocalFeed/Microsoft.Azure.Management.Dns.1.1.0-preview.nupkg‎

-66.7 KB
Binary file not shown.

‎tools/LocalFeed/Microsoft.Azure.Management.Dns.1.1.1-preview.nupkg‎

73.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)