Merge pull request #18 from MabOneSdk/panbha3

panbha · panbha · commit b248dd0451eb · 2015-06-09T19:42:49.000+05:30
Panbha3
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletBase.cs
@@ -41,6 +41,11 @@ public abstract class AzureBackupCmdletBase : AzurePSCmdlet
         /// </summary>
         private string resourceName { get; set; }
 
+        /// <summary>
+        /// Resource context for the operation
+        /// </summary>
+        private string location { get; set; }
+
         /// <summary>
         /// Client request id.
         /// </summary>
@@ -82,10 +87,11 @@ protected void RefreshClientRequestId()
             clientRequestId = Guid.NewGuid().ToString() + "-" + DateTime.Now.ToUniversalTime().ToString("yyyy-MM-dd HH:mm:ssZ") + "-PS";
         }
 
-        public void InitializeAzureBackupCmdlet(string rgName, string rName)
+        public void InitializeAzureBackupCmdlet(string rgName, string rName, string locationName)
         {
             resourceGroupName = rgName;
             resourceName = rName;
+            location = locationName;
 
             RefreshClientRequestId();
             WriteDebug(string.Format("Initialized AzureBackup Cmdlet, ClientRequestId: {0}, ResourceGroupName: {1}, ResourceName : {2}", this.clientRequestId, resourceGroupName, resourceName));
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs
@@ -20,6 +20,7 @@ internal static class AzureBackupCmdletHelpMessage
         public const string PolicyName = "The protection policy name.";
         public const string ResourceGroupName = "The ResourceGroup name.";
         public const string ResourceName = "The Resource name.";
+        public const string Location = "Location.";
         public const string TargetLocation = "The directory where the credentials file will be saved.";
         public const string ContainerResourceName = "The container resource name aka friendly name.";
         public const string ContainerId = "The container ID.";
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs
@@ -40,7 +40,7 @@ public override void ExecuteCmdlet()
 
             WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}", item.ResourceGroupName, item.ResourceName));
 
-            InitializeAzureBackupCmdlet(item.ResourceGroupName, item.ResourceName);
+            InitializeAzureBackupCmdlet(item.ResourceGroupName, item.ResourceName, item.Location);
         }
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupVaultCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupVaultCmdletBase.cs
@@ -36,14 +36,17 @@ public abstract class AzureBackupVaultCmdletBase : AzureBackupCmdletBase
         [ValidateNotNullOrEmpty]
         public string ResourceName { get; set; }
 
+        [Parameter(Position = 2, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.Location, ValueFromPipelineByPropertyName = true)]
+        [ValidateNotNullOrEmpty]
+        public string Location { get; set; }
 
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
             WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}", ResourceGroupName, ResourceName));
 
-            InitializeAzureBackupCmdlet(ResourceGroupName, ResourceName);
+            InitializeAzureBackupCmdlet(ResourceGroupName, ResourceName, Location);
         }
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
@@ -71,7 +71,7 @@ public override void ExecuteCmdlet()
 
                 WriteObject(containerInfos.ConvertAll(containerInfo =>
                 {
-                    return new AzureBackupContainer(containerInfo);
+                    return new AzureBackupContainer(containerInfo, ResourceGroupName, ResourceName,  Location);
                 }));
             });
         }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/GetAzureBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/GetAzureBackupProtectionPolicy.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureBackupProtectionPolicy"), OutputType(typeof(AzureBackupProtectionPolicy), typeof(List<AzureBackupProtectionPolicy>))]
     public class GetAzureBackupProtectionPolicy : AzureBackupVaultCmdletBase
     {
-        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]
+        [Parameter(Position = 3, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
@@ -60,7 +60,7 @@ public override void ExecuteCmdlet()
 
         public void WriteAzureBackupProtectionPolicy(ProtectionPolicyInfo sourcePolicy)
         {
-            this.WriteObject(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, sourcePolicy));
+            this.WriteObject(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, sourcePolicy));
         }
 
         public void WriteAzureBackupProtectionPolicy(IEnumerable<ProtectionPolicyInfo> sourcePolicyList)
@@ -69,7 +69,7 @@ public void WriteAzureBackupProtectionPolicy(IEnumerable<ProtectionPolicyInfo> s
 
             foreach (var sourcePolicy in sourcePolicyList)
             {
-                targetList.Add(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, sourcePolicy));
+                targetList.Add(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, sourcePolicy));
             }
 
             this.WriteObject(targetList, true);
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupBaseObjects.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupBaseObjects.cs
@@ -27,14 +27,20 @@ public class AzureBackupVaultContextObject
         /// </summary>
         public string ResourceName { get; set; }
 
+        /// <summary>
+        /// ResourceName of the azurebackup object
+        /// </summary>
+        public string Location { get; set; }
+
         public AzureBackupVaultContextObject()
         {
         }
-
-        public AzureBackupVaultContextObject(string resourceGroupName, string resourceName)
+                
+        public AzureBackupVaultContextObject(string resourceGroupName, string resourceName, string locationName)
         {
             ResourceGroupName = resourceGroupName;
             ResourceName = resourceName;
+            Location = locationName;
         }
     }
 
@@ -60,20 +66,20 @@ public AzureBackupContainerContextObject()
         }
 
         public AzureBackupContainerContextObject(AzureBackupContainerContextObject azureBackupContainerContextObject)
-            : base(azureBackupContainerContextObject.ResourceGroupName, azureBackupContainerContextObject.ResourceName)
+            : base(azureBackupContainerContextObject.ResourceGroupName, azureBackupContainerContextObject.ResourceName, azureBackupContainerContextObject.Location)
         {
             ContainerType = azureBackupContainerContextObject.ContainerType;
             ContainerUniqueName = azureBackupContainerContextObject.ContainerUniqueName;
         }
         public AzureBackupContainerContextObject(AzureBackupContainer azureBackupContainer)
-            : base(azureBackupContainer.ResourceGroupName, azureBackupContainer.ResourceName)
+            : base(azureBackupContainer.ResourceGroupName, azureBackupContainer.ResourceName, azureBackupContainer.Location)
         {
             ContainerType = azureBackupContainer.ContainerType;
             ContainerUniqueName = azureBackupContainer.ContainerUniqueName;
         }
 
-        public AzureBackupContainerContextObject(ContainerInfo containerInfo)
-            : base(containerInfo.ParentContainerName, containerInfo.FriendlyName)
+        public AzureBackupContainerContextObject(ContainerInfo containerInfo, string rgName, string rName, string location)
+            : base(rgName, rName, location)
         {
             ContainerType = containerInfo.ContainerType;
             ContainerUniqueName = containerInfo.Name;
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupContainer.cs
@@ -38,8 +38,8 @@ public class AzureBackupContainer : AzureBackupContainerContextObject
 
         public AzureBackupContainer() : base() { }
 
-        public AzureBackupContainer(ContainerInfo containerInfo)
-            : base(containerInfo)
+        public AzureBackupContainer(ContainerInfo containerInfo, string rgName, string rName, string location)
+            : base(containerInfo, rgName, rName, location)
         {
             HealthStatus = containerInfo.HealthStatus;
             RegistrationStatus = containerInfo.RegistrationStatus;
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/ProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/ProtectionPolicy.cs
@@ -48,7 +48,8 @@ public AzureBackupProtectionPolicy()
         {
         }
 
-        public AzureBackupProtectionPolicy(string resourceGroupName, string resourceName, ProtectionPolicyInfo sourcePolicy) : base(resourceGroupName, resourceName)
+        public AzureBackupProtectionPolicy(string resourceGroupName, string resourceName, string location, ProtectionPolicyInfo sourcePolicy)
+            : base(resourceGroupName, resourceName, location)
         {
             InstanceId = sourcePolicy.InstanceId;
             Name = sourcePolicy.Name;

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public override void ExecuteCmdlet()`
`40`	`40`
`41`	`41`	`WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}", item.ResourceGroupName, item.ResourceName));`
`42`	`42`
`43`		`- InitializeAzureBackupCmdlet(item.ResourceGroupName, item.ResourceName);`
	`43`	`+ InitializeAzureBackupCmdlet(item.ResourceGroupName, item.ResourceName, item.Location);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,17 @@ public abstract class AzureBackupVaultCmdletBase : AzureBackupCmdletBase`
`36`	`36`	`[ValidateNotNullOrEmpty]`
`37`	`37`	`public string ResourceName { get; set; }`
`38`	`38`
	`39`	`+ [Parameter(Position = 2, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.Location, ValueFromPipelineByPropertyName = true)]`
	`40`	`+ [ValidateNotNullOrEmpty]`
	`41`	`+ public string Location { get; set; }`
`39`	`42`
`40`	`43`	`public override void ExecuteCmdlet()`
`41`	`44`	`{`
`42`	`45`	`base.ExecuteCmdlet();`
`43`	`46`
`44`	`47`	`WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}", ResourceGroupName, ResourceName));`
`45`	`48`
`46`		`- InitializeAzureBackupCmdlet(ResourceGroupName, ResourceName);`
	`49`	`+ InitializeAzureBackupCmdlet(ResourceGroupName, ResourceName, Location);`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public override void ExecuteCmdlet()`
`71`	`71`
`72`	`72`	`WriteObject(containerInfos.ConvertAll(containerInfo =>`
`73`	`73`	`{`
`74`		`- return new AzureBackupContainer(containerInfo);`
	`74`	`+ return new AzureBackupContainer(containerInfo, ResourceGroupName, ResourceName, Location);`
`75`	`75`	`}));`
`76`	`76`	`});`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets`
`27`	`27`	`[Cmdlet(VerbsCommon.Get, "AzureBackupProtectionPolicy"), OutputType(typeof(AzureBackupProtectionPolicy), typeof(List<AzureBackupProtectionPolicy>))]`
`28`	`28`	`public class GetAzureBackupProtectionPolicy : AzureBackupVaultCmdletBase`
`29`	`29`	`{`
`30`		`- [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]`
	`30`	`+ [Parameter(Position = 3, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]`
`31`	`31`	`[ValidateNotNullOrEmpty]`
`32`	`32`	`public string Name { get; set; }`
`33`	`33`
`@@ -60,7 +60,7 @@ public override void ExecuteCmdlet()`
`60`	`60`
`61`	`61`	`public void WriteAzureBackupProtectionPolicy(ProtectionPolicyInfo sourcePolicy)`
`62`	`62`	`{`
`63`		`- this.WriteObject(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, sourcePolicy));`
	`63`	`+ this.WriteObject(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, sourcePolicy));`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public void WriteAzureBackupProtectionPolicy(IEnumerable<ProtectionPolicyInfo> sourcePolicyList)`
`@@ -69,7 +69,7 @@ public void WriteAzureBackupProtectionPolicy(IEnumerable<ProtectionPolicyInfo> s`
`69`	`69`
`70`	`70`	`foreach (var sourcePolicy in sourcePolicyList)`
`71`	`71`	`{`
`72`		`- targetList.Add(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, sourcePolicy));`
	`72`	`+ targetList.Add(new AzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, sourcePolicy));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`this.WriteObject(targetList, true);`
Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,20 @@ public class AzureBackupVaultContextObject`
`27`	`27`	`/// </summary>`
`28`	`28`	`public string ResourceName { get; set; }`
`29`	`29`
	`30`	`+ /// <summary>`
	`31`	`+ /// ResourceName of the azurebackup object`
	`32`	`+ /// </summary>`
	`33`	`+ public string Location { get; set; }`
	`34`	`+`
`30`	`35`	`public AzureBackupVaultContextObject()`
`31`	`36`	`{`
`32`	`37`	`}`
`33`		`-`
`34`		`- public AzureBackupVaultContextObject(string resourceGroupName, string resourceName)`
	`38`	`+`
	`39`	`+ public AzureBackupVaultContextObject(string resourceGroupName, string resourceName, string locationName)`
`35`	`40`	`{`
`36`	`41`	`ResourceGroupName = resourceGroupName;`
`37`	`42`	`ResourceName = resourceName;`
	`43`	`+ Location = locationName;`
`38`	`44`	`}`
`39`	`45`	`}`
`40`	`46`
`@@ -60,20 +66,20 @@ public AzureBackupContainerContextObject()`
`60`	`66`	`}`
`61`	`67`
`62`	`68`	`public AzureBackupContainerContextObject(AzureBackupContainerContextObject azureBackupContainerContextObject)`
`63`		`- : base(azureBackupContainerContextObject.ResourceGroupName, azureBackupContainerContextObject.ResourceName)`
	`69`	`+ : base(azureBackupContainerContextObject.ResourceGroupName, azureBackupContainerContextObject.ResourceName, azureBackupContainerContextObject.Location)`
`64`	`70`	`{`
`65`	`71`	`ContainerType = azureBackupContainerContextObject.ContainerType;`
`66`	`72`	`ContainerUniqueName = azureBackupContainerContextObject.ContainerUniqueName;`
`67`	`73`	`}`
`68`	`74`	`public AzureBackupContainerContextObject(AzureBackupContainer azureBackupContainer)`
`69`		`- : base(azureBackupContainer.ResourceGroupName, azureBackupContainer.ResourceName)`
	`75`	`+ : base(azureBackupContainer.ResourceGroupName, azureBackupContainer.ResourceName, azureBackupContainer.Location)`
`70`	`76`	`{`
`71`	`77`	`ContainerType = azureBackupContainer.ContainerType;`
`72`	`78`	`ContainerUniqueName = azureBackupContainer.ContainerUniqueName;`
`73`	`79`	`}`
`74`	`80`
`75`		`- public AzureBackupContainerContextObject(ContainerInfo containerInfo)`
`76`		`- : base(containerInfo.ParentContainerName, containerInfo.FriendlyName)`
	`81`	`+ public AzureBackupContainerContextObject(ContainerInfo containerInfo, string rgName, string rName, string location)`
	`82`	`+ : base(rgName, rName, location)`
`77`	`83`	`{`
`78`	`84`	`ContainerType = containerInfo.ContainerType;`
`79`	`85`	`ContainerUniqueName = containerInfo.Name;`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public class AzureBackupContainer : AzureBackupContainerContextObject`
`38`	`38`
`39`	`39`	`public AzureBackupContainer() : base() { }`
`40`	`40`
`41`		`- public AzureBackupContainer(ContainerInfo containerInfo)`
`42`		`- : base(containerInfo)`
	`41`	`+ public AzureBackupContainer(ContainerInfo containerInfo, string rgName, string rName, string location)`
	`42`	`+ : base(containerInfo, rgName, rName, location)`
`43`	`43`	`{`
`44`	`44`	`HealthStatus = containerInfo.HealthStatus;`
`45`	`45`	`RegistrationStatus = containerInfo.RegistrationStatus;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ public AzureBackupProtectionPolicy()`
`48`	`48`	`{`
`49`	`49`	`}`
`50`	`50`
`51`		`- public AzureBackupProtectionPolicy(string resourceGroupName, string resourceName, ProtectionPolicyInfo sourcePolicy) : base(resourceGroupName, resourceName)`
	`51`	`+ public AzureBackupProtectionPolicy(string resourceGroupName, string resourceName, string location, ProtectionPolicyInfo sourcePolicy)`
	`52`	`+ : base(resourceGroupName, resourceName, location)`
`52`	`53`	`{`
`53`	`54`	`InstanceId = sourcePolicy.InstanceId;`
`54`	`55`	`Name = sourcePolicy.Name;`