vault cmdlets

Author: pragrawa

src/Common/Commands.Common.Storage/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs

@@ -57,7 +57,11 @@ public override void ExecuteCmdlet()
                 queryFilterString = ConstructQueryFilterString();
                 var containerList = AzureBackupClient.ListContainers(queryFilterString);
 
+<<<<<<< HEAD
                 WriteDebug(string.Format("Fetched {0} containers", containerList.Count()));
+=======
+                WriteDebug(string.Format("# of fetched containers = {0}", listContainerResponse.Objects.Count));
+>>>>>>> dev
 
                 List<ContainerInfo> containerInfos = containerList.ToList();
 
@@ -69,17 +73,23 @@ public override void ExecuteCmdlet()
                     {
                         return containerInfo.ParentContainerName != ContainerResourceGroupName;
                     });
+                    WriteDebug(string.Format("# of containers after resource group filter = {0}", containerInfos.Count));
                 }
 
+<<<<<<< HEAD
                 WriteDebug(string.Format("Count of containers after resource group filter = {0}", containerInfos.Count));
 
                 // TODO: Container friendly name is not captures in Container response
                 // BUG: Friendly name was previously assigned to ResourceName (vault name)
+=======
+>>>>>>> dev
                 List<AzureBackupContainer> containers = containerInfos.ConvertAll(containerInfo =>
                 {
                     return new AzureBackupContainer(vault, containerInfo);
                 });
 
+                // When container resource name and container resource group name are specified, this parameter set
+                // identifies a container uniquely. Thus, we return just one container instead of a list.
                 if (!string.IsNullOrEmpty(ContainerResourceName) & !string.IsNullOrEmpty(ContainerResourceGroupName))
                 {
                     if (containers.Any())

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/GetAzureBackupVaultCredentials/GetAzureBackupVaultCredentials.cs

@@ -54,9 +54,9 @@ public override void ExecuteCmdlet()
                 string resourceType = "resourceType";
                 string displayName = subscriptionId + "_" + ResourceGroupName + "_" + ResourceName;
 
-                WriteVerbose(string.Format(CultureInfo.InvariantCulture,
-                                          "Executing cmdlet with SubscriptionId = {0}, ResourceGroupName = {1}, ResourceName = {2}, TargetLocation = {3}",
-                                          subscriptionId, ResourceGroupName, ResourceName, TargetLocation));
+                WriteDebug(string.Format(CultureInfo.InvariantCulture,
+                                         "Executing cmdlet with SubscriptionId = {0}, ResourceGroupName = {1}, ResourceName = {2}, TargetLocation = {3}",
+                                         subscriptionId, ResourceGroupName, ResourceName, TargetLocation));
 
                 X509Certificate2 cert = CertUtils.CreateSelfSignedCert(CertUtils.DefaultIssuer,
                                                                        CertUtils.GenerateCertFriendlyName(subscriptionId, ResourceName),
@@ -69,9 +69,9 @@ public override void ExecuteCmdlet()
                 try
                 {
                     // Upload cert into ID Mgmt
-                    WriteVerbose(string.Format(CultureInfo.InvariantCulture, "RecoveryService - Going to upload the certificate"));
+                    WriteDebug(string.Format(CultureInfo.InvariantCulture, "RecoveryService - Going to upload the certificate"));
                     acsNamespace = UploadCert(cert, subscriptionId, ResourceName, resourceType, ResourceGroupName);
-                    WriteVerbose(string.Format(CultureInfo.InvariantCulture, "RecoveryService - Successfully uploaded the certificate"));
+                    WriteDebug(string.Format(CultureInfo.InvariantCulture, "RecoveryService - Successfully uploaded the certificate"));
                 }
                 catch (Exception exception)
                 {
@@ -90,7 +90,7 @@ public override void ExecuteCmdlet()
                     directoryPath = TargetLocation;
                 }
                 string filePath = Path.Combine(directoryPath, fileName);
-                WriteVerbose(string.Format("Saving Vault Credentials to file : {0}", filePath));
+                WriteDebug(string.Format("Saving Vault Credentials to file : {0}", filePath));
 
                 File.WriteAllBytes(filePath, Encoding.UTF8.GetBytes(vaultCredsFileContent));
 
@@ -187,7 +187,7 @@ private string GenerateVaultCredsForBackup(X509Certificate2 cert, string subscri
                     DataContractSerializer serializer = new DataContractSerializer(typeof(BackupVaultCreds));
                     serializer.WriteObject(writer, backupVaultCreds);
 
-                    WriteVerbose(string.Format(CultureInfo.InvariantCulture, "RecoveryService - Backup Vault - Successfully serialized the file content"));
+                    WriteDebug(string.Format(CultureInfo.InvariantCulture, "RecoveryService - Backup Vault - Successfully serialized the file content"));
                 }
 
                 return Encoding.UTF8.GetString(output.ToArray());

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/SetAzureBackupVaultStorageType.cs

@@ -41,8 +41,24 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException("Invalid storage type.");
                 }
 
+<<<<<<< HEAD
                 WriteVerbose(String.Format("Updating the storage type. Type:{0}", Type));
                 AzureBackupClient.UpdateStorageType(Type.ToString());
+=======
+                WriteDebug("Updating the storage type.");
+
+                UpdateVaultStorageTypeRequest updateVaultStorageTypeRequest = new UpdateVaultStorageTypeRequest()
+                {
+                    StorageTypeProperties = new StorageTypeProperties()
+                    {
+                        StorageModelType = Type.ToString(),
+                    },
+                };
+
+                AzureBackupClient.Vault.UpdateStorageTypeAsync(updateVaultStorageTypeRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Wait();
+
+                WriteDebug("Update successful.");
+>>>>>>> dev
             });
         }
     }