Merge pull request #269 from MabOneSdk/merge-dev1

Merge dev1

Author: pikumarmsft16

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj

@@ -44,9 +44,9 @@
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.2.0.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\RecoveryServicesDLL\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1

@@ -21,7 +21,7 @@ Recovery Services Vault CRUD Tests
 function Test-RecoveryServicesVaultCRUDTests
 {
 	# Create vault
-	$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName rg1 -Location westus
+	$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName vishakintdrg -Location westus
 	Assert-NotNull($vaultCreationResponse.Name)
 	Assert-NotNull($vaultCreationResponse.ID)
 	Assert-NotNull($vaultCreationResponse.Type)
@@ -37,14 +37,19 @@ function Test-RecoveryServicesVaultCRUDTests
 		Assert-NotNull($vault.Type)
 	}
 
+	$vaultBackupProperties = Get-AzureRmRecoveryServicesBackupProperties -Vault $vaultCreationResponse
+	Assert-NotNull($vaultBackupProperties.BackupStorageRedundancy)
+
+	Set-AzureRmRecoveryServicesBackupProperties -Vault $vaultCreationResponse -BackupStorageRedundancy "LocallyRedundant"
+
 	# Get the created vault
-	$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName rg1 -Name rsv1
+	$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName vishakintdrg -Name rsv1
 	Assert-NotNull($vaultToBeRemoved.Name)
 	Assert-NotNull($vaultToBeRemoved.ID)
 	Assert-NotNull($vaultToBeRemoved.Type)
 
 	# Remove Vault
 	Remove-AzureRmRecoveryServicesVault -Vault $vaultToBeRemoved
-	$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName rg1 -Name rsv1
+	$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName vishakintdrg -Name rsv1
 	Assert-True { $vaults.Count -eq 0 }
 }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs

@@ -93,14 +93,14 @@ public static T GetServiceClient<T>() where T : class
             if (testEnvironment.UsesCustomUri())
             {
                 client = new RecoveryServicesManagementClient(
-                    "Microsoft.RecoveryServicesBVTD2",
+                    "Microsoft.RecoveryServicesBVTD",
                     testEnvironment.Credentials as SubscriptionCloudCredentials,
                     testEnvironment.BaseUri);
             }
             else
             {
                 client = new RecoveryServicesManagementClient(
-                    "Microsoft.RecoveryServicesBVTD2",
+                    "Microsoft.RecoveryServicesBVTD",
                     testEnvironment.Credentials as SubscriptionCloudCredentials);
             }
             return GetServiceClient<T>(factory, client);

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests/VaultCRUDTests.json

@@ -74,5 +74,30 @@ public ResourceGroupListResponse GetResouceGroups()
         {
             return this.GetRecoveryServicesClient.ResourceGroup.List();
         }
+
+
+        /// <summary>  
+        /// Method to Update Azure Recovery Services Vault Backup Properties  
+        /// </summary>  
+        /// <param name="resouceGroupName">Name of the resouce group</param>  
+        /// <param name="vaultName">Name of the vault</param>  
+        /// <param name="vaultStorageUpdateRequest">Backup Properties Update</param>  
+        /// <returns>Azure Operation response object.</returns>  
+        public AzureOperationResponse UpdateVaultStorageType(string resouceGroupName, string vaultName, UpdateVaultStorageTypeRequest vaultStorageUpdateRequest)
+        {
+            return this.recoveryServicesClient.Vaults.UpdateStorageType(resouceGroupName, vaultName,
+                                                            vaultStorageUpdateRequest, this.GetRequestHeaders());
+        }
+
+        /// <summary>  
+        /// Method to Get Azure Recovery Services Vault Backup Properties  
+        /// </summary>  
+        /// <param name="resouceGroupName">Name of the resouce group</param>  
+        /// <param name="vaultName">Name of the vault</param>  
+        /// <returns>Azure Resource Storage response object.</returns>  
+        public GetResourceStorageConfigResponse GetVaultStorageType(string resouceGroupName, string vaultName)
+        {
+            return this.recoveryServicesClient.Vaults.GetResourceStorageConfig(resouceGroupName, vaultName, this.GetRequestHeaders());
+        }
     }
 }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultClient.cs

@@ -125,6 +125,27 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR
             return arsVaultCreds;
         }
 
+        /// <summary>
+        /// Upload cert to idmgmt
+        /// </summary>
+        /// <param name="managementCert">certificate to be uploaded</param>
+        /// <param name="vault">vault object</param>
+        /// <returns>Upload Certificate Response</returns>
+        public UploadCertificateResponse UploadCertificate(X509Certificate2 managementCert, ARSVault vault)
+        {
+            var certificateArgs = new CertificateArgs();
+            certificateArgs.Properties = new Dictionary<string, string>();
+            certificateArgs.Properties.Add("certificate", Convert.ToBase64String(managementCert.GetRawCertData()));
+
+            var response = this.recoveryServicesClient.VaultExtendedInfo.UploadCertificateAsync(
+                vault.ResouceGroupName,
+                vault.Name,
+                certificateArgs, managementCert.FriendlyName,
+                this.GetRequestHeaders());
+            response.Wait();
+            return response.Result;
+        }
+
         /// <summary>
         /// Changes the Vault context
         /// </summary>

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultExtendedInfoClient.cs

@@ -310,10 +310,11 @@ public VaultCreds()
         /// <param name="resourceName">resource name</param>
         /// <param name="managementCert">management cert</param>
         /// <param name="acsNamespace">authenticating service namespace</param>
-        public VaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace)
+        /// <param name="resourceType">resource type backup vault or ASR vault</param>
+        public VaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace, string resourceType = null)
         {
             this.SubscriptionId = subscriptionId;
-            this.ResourceType = Constants.VaultType;
+            this.ResourceType = string.IsNullOrEmpty(resourceType) ? Constants.VaultType : resourceType;
             this.ResourceName = resourceName;
             this.ManagementCert = managementCert;
             this.AcsNamespace = acsNamespace;
@@ -456,6 +457,54 @@ public ASRVaultCreds(
         #endregion
     }
 
+    /// <summary>
+    /// Class to define backup vault credentials
+    /// </summary>
+    [DataContract]
+    public class BackupVaultCreds : VaultCreds
+    {
+        /// <summary>
+        /// Gets or sets the agent links
+        /// </summary>
+        [DataMember(Order = 0)]
+        public string AgentLinks { get; set; }
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the BackupVaultCreds class
+        /// </summary>
+        public BackupVaultCreds() { }
+
+        /// <summary>
+        /// Initializes a new instance of the BackupVaultCreds class
+        /// </summary>
+        /// <param name="subscriptionId">subscription Id</param>
+        /// <param name="resourceType">resource type</param>
+        /// <param name="resourceName">resource name</param>
+        /// <param name="managementCert">management cert</param>
+        /// <param name="acsNamespace">acs namespace</param>
+        public BackupVaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace)
+            : base(subscriptionId, resourceName, managementCert, acsNamespace, Constants.BackupVaultType) { }
+
+        /// <summary>
+        /// Initializes a new instance of the BackupVaultCreds class
+        /// </summary>
+        /// <param name="subscriptionId">subscription Id</param>
+        /// <param name="resourceType">resource type</param>
+        /// <param name="resourceName">resource name</param>
+        /// <param name="managementCert">management cert</param>
+        /// <param name="acsNamespace">acs namespace</param>
+        /// <param name="agentLinks">agent links</param>
+        public BackupVaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace, string agentLinks)
+            : this(subscriptionId, resourceName, managementCert, acsNamespace)
+        {
+            AgentLinks = agentLinks;
+        }
+
+        #endregion
+    }
+
     /// <summary>
     /// Class to define ACS name space
     /// </summary>
@@ -472,9 +521,9 @@ public class AcsNamespace
         /// <param name="acsDetails">authenticating service Details name</param>
         public AcsNamespace(UploadCertificateResponse acsDetails)
         {
-            this.HostName = acsDetails.Properties.GlobalAcsHostName;
-            this.Namespace = acsDetails.Properties.GlobalAcsNamespace;
-            this.ResourceProviderRealm = acsDetails.Properties.GlobalAcsRPRealm;
+            this.HostName = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsHostName;
+            this.Namespace = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsNamespace;
+            this.ResourceProviderRealm = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsRPRealm;
         }
 
         /// <summary>

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs

@@ -26,6 +26,11 @@ public class Constants
         /// </summary>
         public const string VaultType = "HyperVRecoveryManagerVault";
 
+        /// <summary>
+        /// Backup vault type
+        /// </summary>
+        public const string BackupVaultType = "Vaults";
+
         /// <summary>
         /// Vault Credential version.
         /// </summary>
@@ -135,7 +140,7 @@ public ARSVault(VaultCreateResponse vault)
     public class ARSVaultProperties
     {
         #region Properties
-        
+
         /// <summary>
         /// Gets or sets Provisioning State.
         /// </summary>
@@ -144,6 +149,18 @@ public class ARSVaultProperties
         #endregion
     }
 
+    public class ASRVaultBackupProperties
+    {
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets BackupStorageRedundancy type.
+        /// </summary>
+        public string BackupStorageRedundancy { get; set; }
+
+        #endregion
+    }
+
     /// <summary>
     /// Class to define the output of the vault settings file generation.
     /// </summary>

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

@@ -20,5 +20,7 @@ internal static class ARSParameterSets
         /// When excution has to be done for site
         /// </summary>
         internal const string ForSite = "ForSite";
+
+        internal const string ForBackupVaultType = "ForBackupVaultType";
     }
 }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSParameterSets.cs

@@ -277,6 +277,24 @@ Please provide a storage account with the same location as that of the vault.</v
   <data name="SiteNotFound" xml:space="preserve">
     <value>Site {0} is not associated with the Vault {1}</value>
   </data>
+  <data name="BackupVaultSerialized" xml:space="preserve">
+    <value>RecoveryService - Backup Vault - Successfully serialized the file content</value>
+  </data>
+  <data name="ExecutingGetVaultCredCmdlet" xml:space="preserve">
+    <value>Executing cmdlet with SubscriptionId = {0}, ResourceGroupName = {1}, ResourceName = {2}, TargetLocation = {3}</value>
+  </data>
+  <data name="SavingVaultCred" xml:space="preserve">
+    <value>Saving Vault Credentials to file : {0}</value>
+  </data>
+  <data name="UploadedCertToIdmgmt" xml:space="preserve">
+    <value>RecoveryService - Successfully uploaded the certificate</value>
+  </data>
+  <data name="UploadingCertToIdmgmt" xml:space="preserve">
+    <value>RecoveryService - Going to upload the certificate</value>
+  </data>
+  <data name="VaultCredPathException" xml:space="preserve">
+    <value>The target location provided is not a directory. Please provide a directory.</value>
+  </data>
   <data name="ResourceGroupNameNullOrEmpty" xml:space="preserve">
     <value>Resource Group name mentioned is either null or empty</value>
   </data>

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

@@ -221,5 +221,16 @@ private static CngKey Create2048RsaKey()
 
             return CngKey.Create(CngAlgorithm2.Rsa, null, keyCreationParameters);
         }
+
+        /// <summary>
+        /// Returns serialized certificate - Base64 encoded based on the content type
+        /// </summary>
+        /// <param name="cert">The certificate provided</param>
+        /// <param name="contentType">Cert content type</param>
+        /// <returns>The serialized cert value in string</returns>
+        public static string SerializeCert(X509Certificate2 cert, X509ContentType contentType)
+        {
+            return Convert.ToBase64String(cert.Export(contentType));
+        }
     }
 }