Merge pull request #1646 from huangpf/clu

markcowl · markcowl · commit a5374c178e3c · 2016-01-14T10:01:37.000-08:00
AzureRT PR - CLU Format &amp; Types Fix
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/AvailabilitySets/RemoveAzureAvailabilitySetCommand.cs b/src/CLU/Microsoft.Azure.Commands.Compute/AvailabilitySets/RemoveAzureAvailabilitySetCommand.cs
@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Remove, ProfileNouns.AvailabilitySet)]
-    [OutputType(typeof(PSOperation))]
+    [OutputType(typeof(void))]
     [CliCommandAlias("vm;availabilityset;rm")]
     public class RemoveAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet
     {
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/Extension/CustomScript/RemoveAzureVMCustomScriptExtensionCommand.cs b/src/CLU/Microsoft.Azure.Commands.Compute/Extension/CustomScript/RemoveAzureVMCustomScriptExtensionCommand.cs
@@ -22,6 +22,7 @@ namespace Microsoft.Azure.Commands.Compute
         VerbsCommon.Remove,
         ProfileNouns.VirtualMachineCustomScriptExtension)]
     [CliCommandAlias("vm;customscriptextension;rm")]
+    [OutputType(typeof(void))]
     public class RemoveAzureVMCustomScriptExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
         [Parameter(
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/Extension/CustomScript/SetAzureVMCustomScriptExtensionCommand.cs b/src/CLU/Microsoft.Azure.Commands.Compute/Extension/CustomScript/SetAzureVMCustomScriptExtensionCommand.cs
@@ -35,6 +35,7 @@ namespace Microsoft.Azure.Commands.Compute
         ProfileNouns.VirtualMachineCustomScriptExtension,
         DefaultParameterSetName = SetCustomScriptExtensionByContainerBlobsParamSetName)]
     [CliCommandAlias("vm;customscriptextension;set")]
+    [OutputType(typeof(void))]
     public class SetAzureVMCustomScriptExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
         protected const string SetCustomScriptExtensionByContainerBlobsParamSetName = "SetCustomScriptExtensionByContainerAndFileNames";
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/Extension/VMAccess/RemoveAzureVMAccessExtension.cs b/src/CLU/Microsoft.Azure.Commands.Compute/Extension/VMAccess/RemoveAzureVMAccessExtension.cs
@@ -22,6 +22,7 @@ namespace Microsoft.Azure.Commands.Compute
         VerbsCommon.Remove,
         ProfileNouns.VirtualMachineAccessExtension)]
     [CliCommandAlias("vm;accessextension;rm")]
+    [OutputType(typeof(void))]
     public class RemoveAzureVMAccessExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
         [Parameter(
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/Extension/VMAccess/SetAzureVMAccessExtension.cs b/src/CLU/Microsoft.Azure.Commands.Compute/Extension/VMAccess/SetAzureVMAccessExtension.cs
@@ -26,6 +26,7 @@ namespace Microsoft.Azure.Commands.Compute
         VerbsCommon.Set,
         ProfileNouns.VirtualMachineAccessExtension)]
     [CliCommandAlias("vm;accessextension;set")]
+    [OutputType(typeof(void))]
     public class SetAzureVMAccessExtensionCommand : VirtualMachineExtensionBaseCmdlet
     {
         private const string userNameKey = "UserName";
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/VirtualMachine/Action/SetAzureVMCommand.cs b/src/CLU/Microsoft.Azure.Commands.Compute/VirtualMachine/Action/SetAzureVMCommand.cs
@@ -20,6 +20,7 @@ namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsCommon.Set, ProfileNouns.VirtualMachine, DefaultParameterSetName = ResourceGroupNameParameterSet)]
     [CliCommandAlias("vm;set")]
+    [OutputType(typeof(void))]
     public class SetAzureVMCommand : VirtualMachineActionBaseCmdlet
     {
         [Parameter(
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/VirtualMachine/Action/StartAzureVMCommand.cs b/src/CLU/Microsoft.Azure.Commands.Compute/VirtualMachine/Action/StartAzureVMCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsLifecycle.Start, ProfileNouns.VirtualMachine, DefaultParameterSetName = ResourceGroupNameParameterSet)]
-    [OutputType(typeof(PSComputeLongRunningOperation))]
+    [OutputType(typeof(void))]
     [CliCommandAlias("vm;start")]
     public class StartAzureVMCommand : VirtualMachineActionBaseCmdlet
     {
diff --git a/src/CLU/Microsoft.Azure.Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs b/src/CLU/Microsoft.Azure.Commands.Compute/VirtualMachine/Action/StopAzureVMCommand.cs
@@ -23,7 +23,7 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet(VerbsLifecycle.Stop, ProfileNouns.VirtualMachine, DefaultParameterSetName = ResourceGroupNameParameterSet)]
-    [OutputType(typeof(PSComputeLongRunningOperation))]
+    [OutputType(typeof(void))]
     [CliCommandAlias("vm;stop")]
     public class StopAzureVMCommand : VirtualMachineActionBaseCmdlet
     {
diff --git a/src/CLU/Sync/Upload/BlobSynchronizer.cs b/src/CLU/Sync/Upload/BlobSynchronizer.cs
@@ -61,7 +61,9 @@ public bool Synchronize()
                                                               {
                                                                   b.Properties.ContentMD5 = md5HashOfDataChunk;
                                                                   // TODO: CLU
-                                                                  b.WritePagesAsync(stream, dwr.Range.StartIndex, md5HashOfDataChunk).Wait();
+                                                                  Program.SyncOutput.WriteVerboseWithTimestamp(
+                                                                      string.Format("Range Start Index = {0}, ContentMD5 = {1}", dwr.Range.StartIndex, md5HashOfDataChunk));
+                                                                  b.WritePagesAsync(stream, dwr.Range.StartIndex, null).Wait();
                                                                   //b.WritePages(stream, dwr.Range.StartIndex);
                                                               }
                                                           }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.format.ps1xml b/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.format.ps1xml
@@ -101,7 +101,7 @@
         </ListEntries>
       </ListControl>
     </View>
-    <!--<View>
+    <View>
       <Name>Microsoft.Azure.Commands.Compute.Models.PSOperation</Name>
       <ViewSelectedBy>
         <TypeName>Microsoft.Azure.Commands.Compute.Models.PSOperation</TypeName>
@@ -122,7 +122,7 @@
           </ListEntry>
         </ListEntries>
       </ListControl>
-    </View>-->
+    </View>
     <View>
       <Name>Microsoft.Azure.Commands.Compute.Models.PSVirtualMachineImageBase</Name>
       <ViewSelectedBy>
@@ -444,198 +444,6 @@
         </ListEntries>
       </ListControl>
     </View>
-    <View>
-      <Name>Microsoft.Azure.Management.Compute.Models.DataDisk</Name>
-      <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Management.Compute.Models.DataDisk</TypeName>
-      </ViewSelectedBy>
-      <ListControl>
-        <ListEntries>
-          <ListEntry>
-            <ListItems>
-              <ListItem>
-                <Label>Name</Label>
-                <PropertyName>Name</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>DiskSizeGB</Label>
-                <PropertyName>DiskSizeGB</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Lun</Label>
-                <PropertyName>Lun</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Caching</Label>
-                <PropertyName>Caching</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>CreateOption</Label>
-                <PropertyName>CreateOption</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>SourceImage</Label>
-                <PropertyName>SourceImage</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>VirtualHardDisk</Label>
-                <ScriptBlock>
-                  if ($_.VirtualHardDisk -ne $null)
-                  {
-                     $_.VirtualHardDisk.Uri;
-                  }
-                  else
-                  {
-                     $_.VirtualHardDisk;
-                  }
-                </ScriptBlock>
-              </ListItem>
-            </ListItems>
-          </ListEntry>
-        </ListEntries>
-      </ListControl>
-    </View>
-
-    <View>
-      <Name>Microsoft.Azure.Commands.Compute.Extension.DSC.VirtualMachineDscExtensionContext</Name>
-      <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.Compute.Extension.DSC.VirtualMachineDscExtensionContext</TypeName>
-      </ViewSelectedBy>
-      <ListControl>
-        <ListEntries>
-          <ListEntry>
-            <ListItems>
-              <ListItem>
-                <Label>ResourceGroupName</Label>
-                <PropertyName>ResourceGroupName</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Name</Label>
-                <PropertyName>Name</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Publisher</Label>
-                <PropertyName>Publisher</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>ExtensionType</Label>
-                <PropertyName>ExtensionType</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>TypeHandlerVersion</Label>
-                <PropertyName>TypeHandlerVersion</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>ProvisioningState</Label>
-                <PropertyName>ProvisioningState</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Location</Label>
-                <PropertyName>Location</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Id</Label>
-                <PropertyName>Id</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>ModulesUrl</Label>
-                <PropertyName>ModulesUrl</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>ConfigurationFunction</Label>
-                <PropertyName>ConfigurationFunction</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Properties</Label>
-                <PropertyName>Properties</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Statuses</Label>
-                <PropertyName>StatusesText</PropertyName>
-              </ListItem>
-            </ListItems>
-          </ListEntry>
-        </ListEntries>
-      </ListControl>
-    </View>
-  
-    <View>
-      <Name>Microsoft.Azure.Commands.Compute.Extension.DSC.VirtualMachineDscExtensionStatusContext</Name>
-      <OutOfBand />
-      <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.Compute.Extension.DSC.VirtualMachineDscExtensionStatusContext</TypeName>
-      </ViewSelectedBy>
-      <ListControl>
-        <ListEntries>
-          <ListEntry>
-            <ListItems>
-              <ListItem>
-                <Label>ResourceGroupName</Label>
-                <PropertyName>ResourceGroupName</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>VmName</Label>
-                <PropertyName>VmName</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Version</Label>
-                <PropertyName>Version</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Status</Label>
-                <PropertyName>Status</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>StatusCode</Label>
-                <PropertyName>StatusCode</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Timestamp</Label>
-                <ScriptBlock>
-                  $_.Timestamp.ToString("G")
-                </ScriptBlock>
-              </ListItem>
-              <ListItem>
-                <Label>StatusMessage</Label>
-                <PropertyName>StatusMessage</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>DscConfigurationLog</Label>
-                <PropertyName>DscConfigurationLog</PropertyName>
-              </ListItem>
-            </ListItems>
-          </ListEntry>
-        </ListEntries>
-      </ListControl>
-    </View>
-
-    <View>
-      <Name>Microsoft.Azure.Commands.Compute.Models.AzureDiskEncryptionStatusContext</Name>
-      <OutOfBand />
-      <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.Compute.Models.AzureDiskEncryptionStatusContext</TypeName>
-      </ViewSelectedBy>
-      <ListControl>
-        <ListEntries>
-          <ListEntry>
-            <ListItems>
-              <ListItem>
-                <Label>OsVolumeEncrypted</Label>
-                <PropertyName>OsVolumeEncrypted</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>OsVolumeEncryptionSettings</Label>
-                <PropertyName>OsVolumeEncryptionSettingsText</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>DataVolumesEncrypted</Label>
-                <PropertyName>DataVolumesEncrypted</PropertyName>
-              </ListItem>
-            </ListItems>
-          </ListEntry>
-        </ListEntries>
-      </ListControl>
-    </View>
 
   </ViewDefinitions>
 </Configuration>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`namespace Microsoft.Azure.Commands.Compute`
`21`	`21`	`{`
`22`	`22`	`[Cmdlet(VerbsCommon.Remove, ProfileNouns.AvailabilitySet)]`
`23`		`- [OutputType(typeof(PSOperation))]`
	`23`	`+ [OutputType(typeof(void))]`
`24`	`24`	`[CliCommandAlias("vm;availabilityset;rm")]`
`25`	`25`	`public class RemoveAzureAvailabilitySetCommand : AvailabilitySetBaseCmdlet`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ namespace Microsoft.Azure.Commands.Compute`
`22`	`22`	`VerbsCommon.Remove,`
`23`	`23`	`ProfileNouns.VirtualMachineCustomScriptExtension)]`
`24`	`24`	`[CliCommandAlias("vm;customscriptextension;rm")]`
	`25`	`+ [OutputType(typeof(void))]`
`25`	`26`	`public class RemoveAzureVMCustomScriptExtensionCommand : VirtualMachineExtensionBaseCmdlet`
`26`	`27`	`{`
`27`	`28`	`[Parameter(`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ namespace Microsoft.Azure.Commands.Compute`
`35`	`35`	`ProfileNouns.VirtualMachineCustomScriptExtension,`
`36`	`36`	`DefaultParameterSetName = SetCustomScriptExtensionByContainerBlobsParamSetName)]`
`37`	`37`	`[CliCommandAlias("vm;customscriptextension;set")]`
	`38`	`+ [OutputType(typeof(void))]`
`38`	`39`	`public class SetAzureVMCustomScriptExtensionCommand : VirtualMachineExtensionBaseCmdlet`
`39`	`40`	`{`
`40`	`41`	`protected const string SetCustomScriptExtensionByContainerBlobsParamSetName = "SetCustomScriptExtensionByContainerAndFileNames";`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ namespace Microsoft.Azure.Commands.Compute`
`26`	`26`	`VerbsCommon.Set,`
`27`	`27`	`ProfileNouns.VirtualMachineAccessExtension)]`
`28`	`28`	`[CliCommandAlias("vm;accessextension;set")]`
	`29`	`+ [OutputType(typeof(void))]`
`29`	`30`	`public class SetAzureVMAccessExtensionCommand : VirtualMachineExtensionBaseCmdlet`
`30`	`31`	`{`
`31`	`32`	`private const string userNameKey = "UserName";`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ namespace Microsoft.Azure.Commands.Compute`
`20`	`20`	`{`
`21`	`21`	`[Cmdlet(VerbsCommon.Set, ProfileNouns.VirtualMachine, DefaultParameterSetName = ResourceGroupNameParameterSet)]`
`22`	`22`	`[CliCommandAlias("vm;set")]`
	`23`	`+ [OutputType(typeof(void))]`
`23`	`24`	`public class SetAzureVMCommand : VirtualMachineActionBaseCmdlet`
`24`	`25`	`{`
`25`	`26`	`[Parameter(`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`namespace Microsoft.Azure.Commands.Compute`
`22`	`22`	`{`
`23`	`23`	`[Cmdlet(VerbsLifecycle.Start, ProfileNouns.VirtualMachine, DefaultParameterSetName = ResourceGroupNameParameterSet)]`
`24`		`- [OutputType(typeof(PSComputeLongRunningOperation))]`
	`24`	`+ [OutputType(typeof(void))]`
`25`	`25`	`[CliCommandAlias("vm;start")]`
`26`	`26`	`public class StartAzureVMCommand : VirtualMachineActionBaseCmdlet`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`namespace Microsoft.Azure.Commands.Compute`
`24`	`24`	`{`
`25`	`25`	`[Cmdlet(VerbsLifecycle.Stop, ProfileNouns.VirtualMachine, DefaultParameterSetName = ResourceGroupNameParameterSet)]`
`26`		`- [OutputType(typeof(PSComputeLongRunningOperation))]`
	`26`	`+ [OutputType(typeof(void))]`
`27`	`27`	`[CliCommandAlias("vm;stop")]`
`28`	`28`	`public class StopAzureVMCommand : VirtualMachineActionBaseCmdlet`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ public bool Synchronize()`
`61`	`61`	`{`
`62`	`62`	`b.Properties.ContentMD5 = md5HashOfDataChunk;`
`63`	`63`	`// TODO: CLU`
`64`		`- b.WritePagesAsync(stream, dwr.Range.StartIndex, md5HashOfDataChunk).Wait();`
	`64`	`+ Program.SyncOutput.WriteVerboseWithTimestamp(`
	`65`	`+ string.Format("Range Start Index = {0}, ContentMD5 = {1}", dwr.Range.StartIndex, md5HashOfDataChunk));`
	`66`	`+ b.WritePagesAsync(stream, dwr.Range.StartIndex, null).Wait();`
`65`	`67`	`//b.WritePages(stream, dwr.Range.StartIndex);`
`66`	`68`	`}`
`67`	`69`	`}`