Merge pull request #197 from MabOneSdk/dev1-sudreddy

sudhakar4171 · sudhakar4171 · commit 2d96f734e836 · 2016-03-17T16:36:15.000+05:30
Policy cmdlets implementation and bug fixes
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs
@@ -20,13 +20,15 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
+using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
     /// <summary>
     /// Get list of protection policies
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesProtectionPolicy", DefaultParameterSetName = NoParamSet), OutputType(typeof(AzureRmRecoveryServicesPolicyBase), typeof(List<AzureRmRecoveryServicesPolicyBase>))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesProtectionPolicy", DefaultParameterSetName = NoParamSet), OutputType(typeof(List<AzureRmRecoveryServicesPolicyBase>))]
     public class GetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackupCmdletBase
     {
         protected const string PolicyNameParamSet = "PolicyNameParamSet";
@@ -49,15 +51,28 @@ public class GetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackup
 
         public override void ExecuteCmdlet()
         {
-            // TBD section below
-
             base.ExecuteCmdlet();
 
+            string rgName = "";  // TBD
+            string resourceName = "";  // TBD
+            List<AzureRmRecoveryServicesPolicyBase> respList = new List<AzureRmRecoveryServicesPolicyBase>();
+
             switch(this.ParameterSetName)
             {
                 case PolicyNameParamSet:
+                    // validate policyName
+                    PolicyCmdletHelpers.ValidateProtectionPolicyName(Name);
+
+                    // query service
+                    ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
+                                                      Name,
+                                                      HydraAdapter,
+                                                      rgName,
+                                                      resourceName);
+                    respList.Add(ConversionHelpers.GetPolicyModel(policy.Item));
                     break;
 
+                // below cases TBD
                 case WorkloadParamSet:
                     break;
 
@@ -69,9 +84,9 @@ public override void ExecuteCmdlet()
 
                 default:
                     break;
-            }            
+            }
 
-            // TBD
+            WriteObject(respList);
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/NewAzureRmRecoveryServicesPolicy.cs
@@ -55,6 +55,17 @@ public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
+            // validate policy name
+            PolicyCmdletHelpers.ValidateProtectionPolicyName(Name);
+
+            // Validate if policy already exists
+            string rgName = "";  // TBD
+            string resourceName = "";  // TBD
+            if(PolicyCmdletHelpers.GetProtectionPolicyByName(Name, HydraAdapter, rgName, resourceName) != null)
+            {
+                throw new ArgumentException("Policy already exists with this name:" + Name);
+            }
+
             PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
             {  
                 {PolicyParams.PolicyName, Name},
@@ -68,8 +79,11 @@ public override void ExecuteCmdlet()
             psBackupProvider.CreatePolicy();
 
             // now get the created policy and return
-            ProtectionPolicyResponse policy = psBackupProvider.GetPolicy();
-
+            ProtectionPolicyResponse policy = PolicyCmdletHelpers.GetProtectionPolicyByName(
+                                                      Name,
+                                                      HydraAdapter,
+                                                      rgName,
+                                                      resourceName);
             // now convert hydraPolicy to PSObject
             WriteObject(ConversionHelpers.GetPolicyModel(policy.Item));
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/PolicyCmdletHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/PolicyCmdletHelpers.cs
@@ -0,0 +1,73 @@
+﻿// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Management.Automation;
+using System.Text.RegularExpressions;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
+using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
+
+namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
+{   
+    public class PolicyCmdletHelpers 
+    {
+        public static Regex rgx = new Regex(@"^[A-Za-z][-A-Za-z0-9]*[A-Za-z0-9]$");
+
+        public static void ValidateProtectionPolicyName(string policyName)
+        {
+            if (policyName.Length < PolicyConstants.MinPolicyNameLength || 
+                policyName.Length > PolicyConstants.MaxPolicyNameLength)
+            {
+                throw new ArgumentException(string.Format(
+                                   "PolicyName length exception - should be within {0} and {1}",
+                                    PolicyConstants.MinPolicyNameLength,
+                                    PolicyConstants.MaxPolicyNameLength));                
+            }
+
+            if (!rgx.IsMatch(policyName))
+            {
+                var exception = new ArgumentException(
+                    "The protection policy name should contain alphanumeric characters " +
+                    "and cannot start with a number");
+                throw exception;
+            }
+        }
+
+        public static ProtectionPolicyResponse GetProtectionPolicyByName(string policyName,
+                                                 HydraAdapter.HydraAdapter hydraAdapter,
+                                                 string resourceGroupName,
+                                                 string resourceName)
+        {
+            ProtectionPolicyResponse response = null;
+
+            try
+            {
+                response = hydraAdapter.GetProtectionPolicy(resourceGroupName, resourceName, policyName);
+            }
+            catch
+            {
+                // if http response is NotFound - then ignore
+                // else rethrow the exception - TBD
+            }
+
+            return response;
+        }
+    }
+}
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/SetAzureRmRecoveryServicesPolicy.cs
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// <summary>
     /// Update existing protection policy
     /// </summary>
-    [Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesProtectionPolicy")]
+    [Cmdlet(VerbsCommon.Set, "AzureRmRecoveryServicesProtectionPolicy"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>))]
     public class SetAzureRmRecoveryServicesProtectionPolicy : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Policy.RetentionPolicy)]
@@ -47,6 +47,19 @@ public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
+            // Validate policy name
+            PolicyCmdletHelpers.ValidateProtectionPolicyName(Policy.Name);
+
+            // Validate if policy already exists
+            string rgName = "";  // TBD
+            string resourceName = "";  // TBD
+            ProtectionPolicyResponse servicePolicy = PolicyCmdletHelpers.GetProtectionPolicyByName(
+                                                      Policy.Name, HydraAdapter, rgName, resourceName);
+            if (servicePolicy == null)
+            {
+                throw new ArgumentException("Policy doesn't exist with this name:" + Policy.Name);
+            }
+
             PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
             { 
                 {PolicyParams.ProtectionPolicy, Policy},
@@ -55,14 +68,9 @@ public override void ExecuteCmdlet()
             }, HydraAdapter);
 
             IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(Policy.WorkloadType, 
-                                                                                     Policy.BackupManagementType);
-            psBackupProvider.ModifyPolicy();
-
-            // now get the created policy and return
-            ProtectionPolicyResponse policy = psBackupProvider.GetPolicy();
-
+                                                                                     Policy.BackupManagementType);            
             // now convert hydraPolicy to PSObject
-            WriteObject(ConversionHelpers.GetPolicyModel(policy.Item));
+            WriteObject(psBackupProvider.ModifyPolicy());
         }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Cmdlets\ProtectionPolicy\GetAzureRmRecoveryServicesPolicy.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\GetAzureRMBackupSchedulePolicyObject.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\GetAzureRMBackupRetentionPolicyObject.cs" />
+    <Compile Include="Cmdlets\ProtectionPolicy\PolicyCmdletHelpers.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\SetAzureRmRecoveryServicesPolicy.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\NewAzureRmRecoveryServicesPolicy.cs" />
     <Compile Include="CmdletWarningAndErrorMessages.cs" />
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
@@ -51,7 +51,7 @@ public ProtectionPolicyResponse GetProtectionPolicy(
                                      BmsAdapter.CmdletCancellationToken).Result;
         }
 
-        public ProtectionPolicyListResponse GetProtectionPolicy(
+        public ProtectionPolicyListResponse ListProtectionPolicy(
                string resourceGroupName,
                string resourceName,
                ProtectionPolicyQueryParameters queryFilter)
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CmdletParamEnums.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CmdletParamEnums.cs
@@ -38,6 +38,8 @@ public enum PolicyParams
         PolicyName,
         SchedulePolicy,
         RetentionPolicy,
-        ProtectionPolicy
+        ProtectionPolicy,
+        ResourceGroupName,
+        ResourceName        
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs
@@ -12,12 +12,13 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
@@ -39,10 +40,6 @@ public interface IPsBackupProvider
 
         ProtectionPolicyResponse CreatePolicy();
 
-        ProtectionPolicyResponse ModifyPolicy();
-
-        ProtectionPolicyResponse GetPolicy();
-
-        void DeletePolicy();
+        List<AzureRmRecoveryServicesJobBase> ModifyPolicy();
     }
 }
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
@@ -17,6 +17,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
@@ -62,17 +63,7 @@ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse Create
             throw new NotImplementedException();
         }
 
-        public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse ModifyPolicy()
-        {
-            throw new NotImplementedException();
-        }
-
-        public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse GetPolicy()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void DeletePolicy()
+        public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()
         {
             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
diff --git a/src/ResourceManager/RecoveryServices.Backup/Constants.cs b/src/ResourceManager/RecoveryServices.Backup/Constants.cs

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public ProtectionPolicyResponse GetProtectionPolicy(`
`51`	`51`	`BmsAdapter.CmdletCancellationToken).Result;`
`52`	`52`	`}`
`53`	`53`
`54`		`- public ProtectionPolicyListResponse GetProtectionPolicy(`
	`54`	`+ public ProtectionPolicyListResponse ListProtectionPolicy(`
`55`	`55`	`string resourceGroupName,`
`56`	`56`	`string resourceName,`
`57`	`57`	`ProtectionPolicyQueryParameters queryFilter)`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public enum PolicyParams`
`38`	`38`	`PolicyName,`
`39`	`39`	`SchedulePolicy,`
`40`	`40`	`RetentionPolicy,`
`41`		`- ProtectionPolicy`
	`41`	`+ ProtectionPolicy,`
	`42`	`+ ResourceGroupName,`
	`43`	`+ ResourceName`
`42`	`44`	`}`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`using System.Linq;`
`18`	`18`	`using System.Text;`
`19`	`19`	`using System.Threading.Tasks;`
	`20`	`+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;`
`20`	`21`
`21`	`22`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel`
`22`	`23`	`{`
`@@ -62,17 +63,7 @@ public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse Create`
`62`	`63`	`throw new NotImplementedException();`
`63`	`64`	`}`
`64`	`65`
`65`		`- public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse ModifyPolicy()`
`66`		`- {`
`67`		`- throw new NotImplementedException();`
`68`		`- }`
`69`		`-`
`70`		`- public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse GetPolicy()`
`71`		`- {`
`72`		`- throw new NotImplementedException();`
`73`		`- }`
`74`		`-`
`75`		`- public void DeletePolicy()`
	`66`	`+ public List<AzureRmRecoveryServicesJobBase> ModifyPolicy()`
`76`	`67`	`{`
`77`	`68`	`throw new NotImplementedException();`
`78`	`69`	`}`