Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1

dragonfly91 · dragonfly91 · commit 818d39c13e50 · 2016-03-31T10:12:32.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesPolicy.cs
@@ -69,9 +69,29 @@ public override void ExecuteCmdlet()
                 }, HydraAdapter);
 
                 IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(Policy.WorkloadType,
-                                                                                         Policy.BackupManagementType);
-                // now convert hydraPolicy to PSObject
-                WriteObject(psBackupProvider.ModifyPolicy());
+                                                                                         Policy.BackupManagementType);                
+                ProtectionPolicyResponse policyResponse = psBackupProvider.ModifyPolicy();
+
+                if(policyResponse.StatusCode == System.Net.HttpStatusCode.Accepted)
+                {
+                    // Track OperationStatus URL for operation completion
+                    BackUpOperationStatusResponse operationResponse =  WaitForOperationCompletionUsingStatusLink(
+                                                policyResponse.AzureAsyncOperation,
+                                                HydraAdapter.GetProtectionPolicyOperationStatusByURL);
+                                        
+                    if(operationResponse.OperationStatus.Status == OperationStatusValues.Failed.ToString())
+                    {
+                          // if operation failed, then trace warning/error
+                    }
+
+                    // get list of jobIds and return jobResponses                    
+                    WriteObject(GetJobObject(((OperationStatusJobsExtendedInfo)operationResponse.OperationStatus.Properties).JobIds));
+                }
+                else
+                {
+                    // Hydra will return OK if NO datasources are associated with this policy
+                    // just trace and return
+                }
             });
         }
     }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs
@@ -57,6 +57,12 @@ public ProtectionPolicyListResponse ListProtectionPolicy(
                                      BmsAdapter.CmdletCancellationToken).Result;
         }
 
-        // TBD for other operations
+        public BackUpOperationStatusResponse GetProtectionPolicyOperationStatusByURL(string url)
+        {
+            return BmsAdapter.Client.ProtectionPolicy.GetOperationStatusByURLAsync(
+                              url,
+                              BmsAdapter.GetCustomRequestHeaders(),
+                              BmsAdapter.CmdletCancellationToken).Result;                              
+        }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs
@@ -42,14 +42,11 @@ public interface IPsBackupProvider
 
         ProtectionPolicyResponse CreatePolicy();
 
-        List<AzureRmRecoveryServicesJobBase> ModifyPolicy();
-
-        ProtectionPolicyResponse GetPolicy();
+        ProtectionPolicyResponse ModifyPolicy();        
 
         AzureRmRecoveryServicesSchedulePolicyBase GetDefaultSchedulePolicyObject();
 
-        AzureRmRecoveryServicesRetentionPolicyBase GetDefaultRetentionPolicyObject();
-        void DeletePolicy();
+        AzureRmRecoveryServicesRetentionPolicyBase GetDefaultRetentionPolicyObject();        
 
         List<AzureRmRecoveryServicesContainerBase> ListProtectionContainers();
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs
@@ -69,26 +69,16 @@ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse Create
             throw new NotImplementedException();
         }
 
-        public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
+        public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse ModifyPolicy()
         {
             throw new NotImplementedException();
         }
 
         public List<Models.AzureRmRecoveryServicesContainerBase> ListProtectionContainers()
         {
             throw new NotImplementedException();
-        }
-
-        public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse GetPolicy()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void DeletePolicy()
-        {
-            throw new NotImplementedException();
-        }
-
+        }      
+       
         public AzureRmRecoveryServicesSchedulePolicyBase GetDefaultSchedulePolicyObject()
         {
             throw new NotImplementedException();
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
@@ -238,7 +238,7 @@ public ProtectionPolicyResponse CreatePolicy()
                                  hydraRequest);
         }
 
-        public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
+        public ProtectionPolicyResponse ModifyPolicy()
         {
             AzureRmRecoveryServicesRetentionPolicyBase retentionPolicy = (AzureRmRecoveryServicesRetentionPolicyBase)
                                                  ProviderData.ProviderParameters[PolicyParams.RetentionPolicy];
@@ -293,24 +293,8 @@ public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
                 }
             };
 
-            ProtectionPolicyResponse response = HydraAdapter.CreateOrUpdateProtectionPolicy(
-                                                               policy.Name,
-                                                               hydraRequest);
-
-            List<AzureRmRecoveryServicesJobBase> jobsList = new List<AzureRmRecoveryServicesJobBase>();
-
-            if (/*response.StatusCode == System.Net.HttpStatusCode.Accepted*/ true)
-            {
-                // poll for AsyncHeader and get the jobsList
-                // TBD
-            }
-            else
-            {
-                // no datasources attached to policy
-                // hence no jobs and no action.
-            }
-
-            return jobsList;
+            return HydraAdapter.CreateOrUpdateProtectionPolicy(policy.Name,
+                                                               hydraRequest);            
         }
 
         public List<AzureRmRecoveryServicesContainerBase> ListProtectionContainers()
@@ -406,18 +390,7 @@ public List<AzureRmRecoveryServicesItemBase> ListProtectedItems()
             }
 
             return itemModels;
-        }
-
-        public ProtectionPolicyResponse GetPolicy()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void DeletePolicy()
-        {
-            throw new NotImplementedException();
-        }
-
+        }      
 
         public AzureRmRecoveryServicesSchedulePolicyBase GetDefaultSchedulePolicyObject()
         {
diff --git a/src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs b/src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs
@@ -38,8 +38,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// </summary>
     public abstract class RecoveryServicesBackupCmdletBase : AzureRMCmdlet
     {
-        public delegate BackUpOperationStatusResponse GetOpResponse(string url);
-
         // in seconds
         private int _defaultSleepForOperationTracking = 15;
 
@@ -134,7 +132,7 @@ public AzureRmRecoveryServicesJobBase GetJobObject(string jobId)
             return JobConversions.GetPSJob(HydraAdapter.GetJob(jobId));
         }
 
-        public List<AzureRmRecoveryServicesJobBase> GetJobObject(List<string> jobIds)
+        public List<AzureRmRecoveryServicesJobBase> GetJobObject(IList<string> jobIds)
         {
             List<AzureRmRecoveryServicesJobBase> result = new List<AzureRmRecoveryServicesJobBase>();
             foreach (string jobId in jobIds)
@@ -144,17 +142,19 @@ public List<AzureRmRecoveryServicesJobBase> GetJobObject(List<string> jobIds)
             return result;
         }
 
-        public BackUpOperationStatusResponse WaitForOperation(string url, GetOpResponse hydraFunc)
+        public BackUpOperationStatusResponse WaitForOperationCompletionUsingStatusLink(
+                                              string statusUrlLink,
+                                              Func<string, BackUpOperationStatusResponse> hydraFunc)
         {
             // using this directly because it doesn't matter which function we use.
             // return type is same and currently we are using it in only two places.
             // protected item and policy.
-            BackUpOperationStatusResponse response = hydraFunc(url);
+            BackUpOperationStatusResponse response = hydraFunc(statusUrlLink);
 
             while (response.OperationStatus.Status == OperationStatusValues.InProgress.ToString())
             {
                 Thread.Sleep(_defaultSleepForOperationTracking * 1000);
-                response = HydraAdapter.GetProtectedItemOperationStatusByURL(url);
+                response = hydraFunc(statusUrlLink);
             }
 
             return response;

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,12 @@ public ProtectionPolicyListResponse ListProtectionPolicy(`
`57`	`57`	`BmsAdapter.CmdletCancellationToken).Result;`
`58`	`58`	`}`
`59`	`59`
`60`		`- // TBD for other operations`
	`60`	`+ public BackUpOperationStatusResponse GetProtectionPolicyOperationStatusByURL(string url)`
	`61`	`+ {`
	`62`	`+ return BmsAdapter.Client.ProtectionPolicy.GetOperationStatusByURLAsync(`
	`63`	`+ url,`
	`64`	`+ BmsAdapter.GetCustomRequestHeaders(),`
	`65`	`+ BmsAdapter.CmdletCancellationToken).Result;`
	`66`	`+ }`
`61`	`67`	`}`
`62`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,26 +69,16 @@ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse Create`
`69`	`69`	`throw new NotImplementedException();`
`70`	`70`	`}`
`71`	`71`
`72`		`- public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()`
	`72`	`+ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse ModifyPolicy()`
`73`	`73`	`{`
`74`	`74`	`throw new NotImplementedException();`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public List<Models.AzureRmRecoveryServicesContainerBase> ListProtectionContainers()`
`78`	`78`	`{`
`79`	`79`	`throw new NotImplementedException();`
`80`		`- }`
`81`		`-`
`82`		`- public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse GetPolicy()`
`83`		`- {`
`84`		`- throw new NotImplementedException();`
`85`		`- }`
`86`		`-`
`87`		`- public void DeletePolicy()`
`88`		`- {`
`89`		`- throw new NotImplementedException();`
`90`		`- }`
`91`		`-`
	`80`	`+ }`
	`81`	`+`
`92`	`82`	`public AzureRmRecoveryServicesSchedulePolicyBase GetDefaultSchedulePolicyObject()`
`93`	`83`	`{`
`94`	`84`	`throw new NotImplementedException();`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets`
`38`	`38`	`/// </summary>`
`39`	`39`	`public abstract class RecoveryServicesBackupCmdletBase : AzureRMCmdlet`
`40`	`40`	`{`
`41`		`- public delegate BackUpOperationStatusResponse GetOpResponse(string url);`
`42`		`-`
`43`	`41`	`// in seconds`
`44`	`42`	`private int _defaultSleepForOperationTracking = 15;`
`45`	`43`
`@@ -134,7 +132,7 @@ public AzureRmRecoveryServicesJobBase GetJobObject(string jobId)`
`134`	`132`	`return JobConversions.GetPSJob(HydraAdapter.GetJob(jobId));`
`135`	`133`	`}`
`136`	`134`
`137`		`- public List<AzureRmRecoveryServicesJobBase> GetJobObject(List<string> jobIds)`
	`135`	`+ public List<AzureRmRecoveryServicesJobBase> GetJobObject(IList<string> jobIds)`
`138`	`136`	`{`
`139`	`137`	`List<AzureRmRecoveryServicesJobBase> result = new List<AzureRmRecoveryServicesJobBase>();`
`140`	`138`	`foreach (string jobId in jobIds)`
`@@ -144,17 +142,19 @@ public List<AzureRmRecoveryServicesJobBase> GetJobObject(List<string> jobIds)`
`144`	`142`	`return result;`
`145`	`143`	`}`
`146`	`144`
`147`		`- public BackUpOperationStatusResponse WaitForOperation(string url, GetOpResponse hydraFunc)`
	`145`	`+ public BackUpOperationStatusResponse WaitForOperationCompletionUsingStatusLink(`
	`146`	`+ string statusUrlLink,`
	`147`	`+ Func<string, BackUpOperationStatusResponse> hydraFunc)`
`148`	`148`	`{`
`149`	`149`	`// using this directly because it doesn't matter which function we use.`
`150`	`150`	`// return type is same and currently we are using it in only two places.`
`151`	`151`	`// protected item and policy.`
`152`		`- BackUpOperationStatusResponse response = hydraFunc(url);`
	`152`	`+ BackUpOperationStatusResponse response = hydraFunc(statusUrlLink);`
`153`	`153`
`154`	`154`	`while (response.OperationStatus.Status == OperationStatusValues.InProgress.ToString())`
`155`	`155`	`{`
`156`	`156`	`Thread.Sleep(_defaultSleepForOperationTracking * 1000);`
`157`		`- response = HydraAdapter.GetProtectedItemOperationStatusByURL(url);`
	`157`	`+ response = hydraFunc(statusUrlLink);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`return response;`