Fix the issue of New-AzureRmDisk, New-AzureRmSnapshot, Update-AzureRmDisk and Update-AzureRmSnapshot.

hyonholee · hyonholee · commit 8944f4f210cb · 2017-07-13T12:22:33.000-07:00
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Disk/DiskCreateOrUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Disk/DiskCreateOrUpdateMethod.cs
@@ -19,6 +19,7 @@
 // Changes to this file may cause incorrect behavior and will be lost if the
 // code is regenerated.
 
+using AutoMapper;
 using Microsoft.Azure.Commands.Compute.Automation.Models;
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
@@ -117,16 +118,20 @@ public partial class NewAzureRmDisk : ComputeAutomationBaseCmdlet
     {
         protected override void ProcessRecord()
         {
+            ComputeAutomationAutoMapperProfile.Initialize();
             ExecuteClientAction(() =>
             {
                 if (ShouldProcess(this.ResourceGroupName, VerbsCommon.New))
                 {
                     string resourceGroupName = this.ResourceGroupName;
                     string diskName = this.DiskName;
-					PSDisk disk = this.Disk;
-
+                    Disk disk = new Disk();
+                    Mapper.Map<PSDisk, Disk>(this.Disk, disk);
                     var result = DisksClient.CreateOrUpdate(resourceGroupName, diskName, disk);
-                    WriteObject(result);
+
+                    PSDisk psResult = new PSDisk();
+                    Mapper.Map<Disk, PSDisk>(result, psResult);
+                    WriteObject(psResult);
                 }
             });
         }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Disk/DiskUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Disk/DiskUpdateMethod.cs
@@ -121,19 +121,23 @@ public partial class UpdateAzureRmDisk : ComputeAutomationBaseCmdlet
     {
         protected override void ProcessRecord()
         {
+            ComputeAutomationAutoMapperProfile.Initialize();
             ExecuteClientAction(() =>
             {
                 if (ShouldProcess(this.ResourceGroupName, VerbsData.Update))
                 {
-
                     string resourceGroupName = this.ResourceGroupName;
                     string diskName = this.DiskName;
-                    PSDiskUpdate disk = this.DiskUpdate;
-                    PSDisk diskOrg = this.Disk;
 
-                    var result = (disk == null)
-                                 ? DisksClient.CreateOrUpdate(resourceGroupName, diskName, diskOrg)
-                                 : DisksClient.Update(resourceGroupName, diskName, disk);
+                    Disk diskObj = new Disk();
+                    Mapper.Map<PSDisk, Disk>(this.Disk, diskObj);
+
+                    DiskUpdate diskUpdateObj= new DiskUpdate();
+                    Mapper.Map<PSDiskUpdate, DiskUpdate>(this.DiskUpdate, diskUpdateObj);
+
+                    var result = (this.DiskUpdate == null)
+                                 ? DisksClient.CreateOrUpdate(resourceGroupName, diskName, diskObj)
+                                 : DisksClient.Update(resourceGroupName, diskName, diskUpdateObj);
 
 					var psObject = new PSDisk();
 					Mapper.Map<Disk, PSDisk>(result, psObject);
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Models/ComputeAutoMapperProfile.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Models/ComputeAutoMapperProfile.cs
@@ -95,6 +95,14 @@ protected override void Configure()
             Mapper.CreateMap<FROM.DiskUpdate, FROM.Disk>();
             Mapper.CreateMap<FROM.Snapshot, FROM.SnapshotUpdate>();
             Mapper.CreateMap<FROM.SnapshotUpdate, FROM.Snapshot>();
+            Mapper.CreateMap<FROM.Disk, TO.PSDisk>();
+            Mapper.CreateMap<TO.PSDisk, FROM.Disk>();
+            Mapper.CreateMap<FROM.DiskUpdate, TO.PSDiskUpdate>();
+            Mapper.CreateMap<TO.PSDiskUpdate, FROM.DiskUpdate>();
+            Mapper.CreateMap<FROM.Snapshot, TO.PSSnapshot>();
+            Mapper.CreateMap<TO.PSSnapshot, FROM.Snapshot>();
+            Mapper.CreateMap<FROM.SnapshotUpdate, TO.PSSnapshotUpdate>();
+            Mapper.CreateMap<TO.PSSnapshotUpdate, FROM.SnapshotUpdate>();
         }
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Snapshot/SnapshotCreateOrUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Snapshot/SnapshotCreateOrUpdateMethod.cs
@@ -19,6 +19,7 @@
 // Changes to this file may cause incorrect behavior and will be lost if the
 // code is regenerated.
 
+using AutoMapper;
 using Microsoft.Azure.Commands.Compute.Automation.Models;
 using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
@@ -117,16 +118,21 @@ public partial class NewAzureRmSnapshot : ComputeAutomationBaseCmdlet
     {
         protected override void ProcessRecord()
         {
+            ComputeAutomationAutoMapperProfile.Initialize();
             ExecuteClientAction(() =>
             {
                 if (ShouldProcess(this.ResourceGroupName, VerbsCommon.New))
                 {
                     string resourceGroupName = this.ResourceGroupName;
                     string snapshotName = this.SnapshotName;
-                    PSSnapshot snapshot = this.Snapshot;
+                    Snapshot snapshot = new Snapshot();
+                    Mapper.Map<PSSnapshot, Snapshot>(this.Snapshot, snapshot);
 
                     var result = SnapshotsClient.CreateOrUpdate(resourceGroupName, snapshotName, snapshot);
-                    WriteObject(result);
+
+                    PSSnapshot psResult = new PSSnapshot();
+                    Mapper.Map<Snapshot, PSSnapshot>(result, psResult);
+                    WriteObject(psResult);
                 }
             });
         }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Snapshot/SnapshotUpdateMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Snapshot/SnapshotUpdateMethod.cs
@@ -121,19 +121,23 @@ public partial class UpdateAzureRmSnapshot : ComputeAutomationBaseCmdlet
     {
         protected override void ProcessRecord()
         {
+            ComputeAutomationAutoMapperProfile.Initialize();
             ExecuteClientAction(() =>
             {
                 if (ShouldProcess(this.ResourceGroupName, VerbsData.Update))
                 {
-
                     string resourceGroupName = this.ResourceGroupName;
                     string snapshotName = this.SnapshotName;
-                    PSSnapshotUpdate snapshot = this.SnapshotUpdate;
-                    PSSnapshot snapshotOrg = this.Snapshot;
 
-                    var result = (snapshot == null)
-                                 ? SnapshotsClient.CreateOrUpdate(resourceGroupName, snapshotName, snapshotOrg)
-                                 : SnapshotsClient.Update(resourceGroupName, snapshotName, snapshot);
+                    Snapshot snapshotObj = new Snapshot();
+                    Mapper.Map<PSSnapshot, Snapshot>(this.Snapshot, snapshotObj);
+
+                    SnapshotUpdate snapshotUpdateObj = new SnapshotUpdate();
+                    Mapper.Map<PSSnapshotUpdate, SnapshotUpdate>(this.SnapshotUpdate, snapshotUpdateObj);
+
+                    var result = (this.SnapshotUpdate == null)
+                                 ? SnapshotsClient.CreateOrUpdate(resourceGroupName, snapshotName, snapshotObj)
+                                 : SnapshotsClient.Update(resourceGroupName, snapshotName, snapshotUpdateObj);
 
 					var psObject = new PSSnapshot();
 					Mapper.Map<Snapshot, PSSnapshot>(result, psObject);

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`// Changes to this file may cause incorrect behavior and will be lost if the`
`20`	`20`	`// code is regenerated.`
`21`	`21`
	`22`	`+using AutoMapper;`
`22`	`23`	`using Microsoft.Azure.Commands.Compute.Automation.Models;`
`23`	`24`	`using Microsoft.Azure.Management.Compute;`
`24`	`25`	`using Microsoft.Azure.Management.Compute.Models;`
`@@ -117,16 +118,20 @@ public partial class NewAzureRmDisk : ComputeAutomationBaseCmdlet`
`117`	`118`	`{`
`118`	`119`	`protected override void ProcessRecord()`
`119`	`120`	`{`
	`121`	`+ ComputeAutomationAutoMapperProfile.Initialize();`
`120`	`122`	`ExecuteClientAction(() =>`
`121`	`123`	`{`
`122`	`124`	`if (ShouldProcess(this.ResourceGroupName, VerbsCommon.New))`
`123`	`125`	`{`
`124`	`126`	`string resourceGroupName = this.ResourceGroupName;`
`125`	`127`	`string diskName = this.DiskName;`
`126`		`- PSDisk disk = this.Disk;`
`127`		`-`
	`128`	`+ Disk disk = new Disk();`
	`129`	`+ Mapper.Map<PSDisk, Disk>(this.Disk, disk);`
`128`	`130`	`var result = DisksClient.CreateOrUpdate(resourceGroupName, diskName, disk);`
`129`		`- WriteObject(result);`
	`131`	`+`
	`132`	`+ PSDisk psResult = new PSDisk();`
	`133`	`+ Mapper.Map<Disk, PSDisk>(result, psResult);`
	`134`	`+ WriteObject(psResult);`
`130`	`135`	`}`
`131`	`136`	`});`
`132`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,14 @@ protected override void Configure()`
`95`	`95`	`Mapper.CreateMap<FROM.DiskUpdate, FROM.Disk>();`
`96`	`96`	`Mapper.CreateMap<FROM.Snapshot, FROM.SnapshotUpdate>();`
`97`	`97`	`Mapper.CreateMap<FROM.SnapshotUpdate, FROM.Snapshot>();`
	`98`	`+ Mapper.CreateMap<FROM.Disk, TO.PSDisk>();`
	`99`	`+ Mapper.CreateMap<TO.PSDisk, FROM.Disk>();`
	`100`	`+ Mapper.CreateMap<FROM.DiskUpdate, TO.PSDiskUpdate>();`
	`101`	`+ Mapper.CreateMap<TO.PSDiskUpdate, FROM.DiskUpdate>();`
	`102`	`+ Mapper.CreateMap<FROM.Snapshot, TO.PSSnapshot>();`
	`103`	`+ Mapper.CreateMap<TO.PSSnapshot, FROM.Snapshot>();`
	`104`	`+ Mapper.CreateMap<FROM.SnapshotUpdate, TO.PSSnapshotUpdate>();`
	`105`	`+ Mapper.CreateMap<TO.PSSnapshotUpdate, FROM.SnapshotUpdate>();`
`98`	`106`	`}`
`99`	`107`	`}`
`100`	`108`	`}`