Merge pull request #98 from MabOneSdk/dev1-pikumar-git2

pikumarmsft16 · pikumarmsft16 · commit 4edcd644e2b7 · 2015-08-10T17:54:38.000+05:30
Dev1 pikumar git2
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletBase.cs
@@ -167,8 +167,13 @@ internal CSMOperationResult TrackOperation(Guid operationId, int checkFrequency
             {
                 response = GetOperationStatus(operationId);
 
-                if (response.Status == CSMAzureBackupOperationStatus.Succeeded.ToString())
+                if (response.Status != CSMAzureBackupOperationStatus.InProgress.ToString())
                 {
+                    if(response.Status == CSMAzureBackupOperationStatus.Failed.ToString())
+                    {
+                        throw new Exception(string.Format("OperationStatus for operaiton id {0} is failed with error : {1}", operationId, response.Error.ToString()));
+                    }
+
                     break;
                 }
 
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureBackupProtection .cs
@@ -62,13 +62,13 @@ public override void ExecuteCmdlet()
                     }
                     else
                     {
-                        throw new Exception("Uknown item type");
+                        throw new Exception("Unknown item type");
                     }
                 }
 
                 else
                 {
-                    throw new Exception("Uknown item type");
+                    throw new Exception("Unknown item type");
                 }
 
                 var operationId = AzureBackupClient.EnableProtection(Item.ContainerUniqueName, itemName, input);
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml
@@ -119,5 +119,49 @@
         </TableRowEntries>
       </TableControl>
     </View>
+    <View>
+      <Name>Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem</TypeName>
+      </ViewSelectedBy>
+      <TableControl>
+        <TableHeaders>
+          <TableColumnHeader>
+            <Label>ItemName</Label>
+            <Width>18</Width>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Label>ProtectionStatus</Label>
+            <Width>18</Width>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Label>RecoveryPointsCount</Label>
+            <Width>22</Width>
+          </TableColumnHeader>
+          <TableColumnHeader>
+            <Label>ProtectionPolicyName</Label>
+            <Width>36</Width>
+          </TableColumnHeader>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <PropertyName>ItemName</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>ProtectionStatus</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>RecoveryPointsCount</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>ProtectionPolicyName</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
+    </View>
   </ViewDefinitions>
 </Configuration>

Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,13 @@ internal CSMOperationResult TrackOperation(Guid operationId, int checkFrequency`
`167`	`167`	`{`
`168`	`168`	`response = GetOperationStatus(operationId);`
`169`	`169`
`170`		`- if (response.Status == CSMAzureBackupOperationStatus.Succeeded.ToString())`
	`170`	`+ if (response.Status != CSMAzureBackupOperationStatus.InProgress.ToString())`
`171`	`171`	`{`
	`172`	`+ if(response.Status == CSMAzureBackupOperationStatus.Failed.ToString())`
	`173`	`+ {`
	`174`	`+ throw new Exception(string.Format("OperationStatus for operaiton id {0} is failed with error : {1}", operationId, response.Error.ToString()));`
	`175`	`+ }`
	`176`	`+`
`172`	`177`	`break;`
`173`	`178`	`}`
`174`	`179`
Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,13 @@ public override void ExecuteCmdlet()`
`62`	`62`	`}`
`63`	`63`	`else`
`64`	`64`	`{`
`65`		`- throw new Exception("Uknown item type");`
	`65`	`+ throw new Exception("Unknown item type");`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`else`
`70`	`70`	`{`
`71`		`- throw new Exception("Uknown item type");`
	`71`	`+ throw new Exception("Unknown item type");`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`var operationId = AzureBackupClient.EnableProtection(Item.ContainerUniqueName, itemName, input);`