Merge pull request #5 from AsrOneSdk/devA2A-avrai

Extending support for Azure fabrics in create and list/get fabric.

Author: sriramvu

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryFabricClient.cs

@@ -52,24 +52,9 @@ public FabricResponse GetAzureSiteRecoveryFabric(string fabricName)
         /// </summary>
         /// <param name="createAndAssociatePolicyInput">Policy Input</param>
         /// <returns>Long operation response</returns>
-        public LongRunningOperationResponse CreateAzureSiteRecoveryFabric(string fabricName, string fabricType = null) 
+        public LongRunningOperationResponse CreateAzureSiteRecoveryFabric(string fabricName, FabricCreationInput input) 
         {
-            if (string.IsNullOrEmpty(fabricType))
-            {
-                fabricType = FabricProviders.HyperVSite;
-            }
-
-            FabricCreationInputProperties fabricCreationInputProperties = new FabricCreationInputProperties()
-            {
-                FabricType = fabricType,
-            };
-
-            FabricCreationInput fabricCreationInput = new FabricCreationInput()
-            {
-                Properties = fabricCreationInputProperties
-            };
-
-            return this.GetSiteRecoveryClient().Fabrics.BeginCreating(fabricName, fabricCreationInput,
+            return this.GetSiteRecoveryClient().Fabrics.BeginCreating(fabricName, input,
                 this.GetRequestHeaders(false));
         }
 

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Fabrics/NewAzureRmSiteRecoveryFabric.cs

@@ -44,9 +44,17 @@ public class NewAzureRmSiteRecoveryFabric : SiteRecoveryCmdletBase
         [Parameter(ParameterSetName = ASRParameterSets.Default, Mandatory = false)]
         [ValidateNotNullOrEmpty]
         [ValidateSet(
-            Constants.HyperVSite)]
+            Constants.HyperVSite,
+            Constants.Azure)]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or Sets the Fabric type
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.Default, Mandatory = false)]
+        [ValidateNotNullOrEmpty]
+        public string Location { get; set; }
+
         #endregion Parameters
 
         /// <summary>
@@ -56,10 +64,35 @@ public override void ExecuteSiteRecoveryCmdlet()
         {
             base.ExecuteSiteRecoveryCmdlet();
 
-            string fabricType = string.IsNullOrEmpty(this.Type)? FabricProviders.HyperVSite : this.Type;
+            FabricCreationInputProperties fabricCreationInputProperties = new FabricCreationInputProperties();
+
+            if (!string.IsNullOrEmpty(this.Type) &&
+                string.Compare(this.Type, Constants.Azure, StringComparison.OrdinalIgnoreCase) == 0 &&
+                string.IsNullOrEmpty(this.Location))
+            {
+                throw new InvalidOperationException(
+                    string.Format(
+                    Properties.Resources.LocationNotSpecifiedForAzureFabric));
+            }
+
+            if (!string.IsNullOrEmpty(this.Type) &&
+                string.Compare(this.Type, Constants.Azure, StringComparison.OrdinalIgnoreCase) == 0 &&
+                !string.IsNullOrEmpty(this.Location))
+            {
+                fabricCreationInputProperties.CustomDetails = new AzureFabricCreationInput()
+                {
+                    // TODO : (AvRai) Validate that passed location is a valid Azure locations.
+                    Location = this.Location
+                };
+            }
+
+            FabricCreationInput fabricCreationInput = new FabricCreationInput()
+            {
+                Properties = fabricCreationInputProperties
+            };
 
             LongRunningOperationResponse response =
-             RecoveryServicesClient.CreateAzureSiteRecoveryFabric(this.Name, fabricType);
+             RecoveryServicesClient.CreateAzureSiteRecoveryFabric(this.Name, fabricCreationInput);
 
             JobResponse jobResponse =
                 RecoveryServicesClient

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSConstants.cs

@@ -297,6 +297,11 @@ public static class Constants
         /// </summary>
         public const string HyperVSite = "HyperVSite";
 
+        /// <summary>
+        /// FabricType - Azure.
+        /// </summary>
+        public const string Azure = "Azure";
+
         /// <summary>
         /// FabricType - VMware.
         /// </summary>

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSObjects.cs

@@ -261,6 +261,14 @@ public ASRFabric(Fabric fabric)
             this.ID = fabric.Id;
             this.Type = fabric.Properties.CustomDetails.InstanceType;
             this.SiteIdentifier = fabric.Properties.InternalIdentifier;
+
+            if (
+                string.Compare(fabric.Properties.CustomDetails.InstanceType, "Azure", StringComparison.OrdinalIgnoreCase) ==
+                0)
+            {
+                var azureFabricSpecificDetails = fabric.Properties.CustomDetails as AzureFabricSpecificDetails;
+                this.Location = azureFabricSpecificDetails != null ? azureFabricSpecificDetails.Location : null;
+            }
         }
 
         #endregion
@@ -291,6 +299,11 @@ public ASRFabric(Fabric fabric)
         /// </summary>
         public string SiteIdentifier { get; set; }
 
+        /// <summary>
+        /// Gets or sets Location.
+        /// </summary>
+        public string Location { get; set; }
+
         #endregion
     }
 

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.Designer.cs

@@ -349,4 +349,7 @@ Please provide a storage account with the same location as that of the vault.</v
   <data name="ReplicationProtectedItemNotFound" xml:space="preserve">
     <value>Replication Protected Item"{0}" is not associated with Protection Container "{1}"</value>
   </data>
+  <data name="LocationNotSpecifiedForAzureFabric" xml:space="preserve">
+    <value>Location is not specified for creating Azure fabric.</value>
+  </data>
 </root>

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.resx

@@ -58,8 +58,15 @@ public override void ExecuteSiteRecoveryCmdlet()
                     this.MyInvocation.MyCommand.Name,
                     "New-AzureRmSiteRecoveryFabric"));
 
+            FabricCreationInputProperties fabricCreationInputProperties = new FabricCreationInputProperties();
+
+            FabricCreationInput fabricCreationInput = new FabricCreationInput()
+            {
+                Properties = fabricCreationInputProperties
+            };
+
             LongRunningOperationResponse response =
-             RecoveryServicesClient.CreateAzureSiteRecoveryFabric(this.Name, FabricProviders.HyperVSite);
+             RecoveryServicesClient.CreateAzureSiteRecoveryFabric(this.Name, fabricCreationInput);
 
             JobResponse jobResponse =
                 RecoveryServicesClient