Register and Unregister cmdlet

Author: mkherani

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

@@ -63,26 +63,23 @@ public override void ExecuteCmdlet()
                 if(isDiscoveryNeed)
                 {
                     RefreshContainer();
-                }
-
-                isDiscoveryNeed = IsDiscoveryNeeded(vmName, rgName, out container);
-                if((isDiscoveryNeed == false) && (container == null))
-                {
-                    //Container is not discovered. Throw exception
-                    throw new NotImplementedException();
-                }
-                else
-                {
-                    //Container is discovered. Register the container
-                    List<string> containerNameList = new List<string>();
-                    containerNameList.Add(container.Name);
-                    RegisterContainerRequest registrationRequest = new RegisterContainerRequest(containerNameList, AzureBackupContainerType.IaasVMContainer.ToString());
-                    operationResponse = AzureBackupClient.Container.RegisterAsync(registrationRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-
-                    //TODO fix the OperationResponse to JobID conversion
-                    jobId = operationResponse.OperationId;
-                    WriteObject(jobId);
-                }
+                    isDiscoveryNeed = IsDiscoveryNeeded(vmName, rgName, out container);
+                    if ((isDiscoveryNeed == true) || (container == null))
+                    {
+                        //Container is not discovered. Throw exception
+                        throw new NotImplementedException();
+                    }
+                }                
+
+                //Container is discovered. Register the container
+                List<string> containerNameList = new List<string>();
+                containerNameList.Add(container.Name);
+                RegisterContainerRequestInput registrationRequest = new RegisterContainerRequestInput(containerNameList, AzureBackupContainerType.IaasVMContainer.ToString());
+                operationResponse = AzureBackupClient.Container.RegisterAsync(registrationRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+
+                //TODO fix the OperationResponse to JobID conversion
+                jobId = operationResponse.OperationId;
+                WriteObject(jobId);
             });
         }
 
@@ -144,10 +141,9 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, out ContainerInfo c
             bool isDiscoveryNeed = false;
             //First check if container is discoverd or not
             ListContainerQueryParameter queryParams = new ListContainerQueryParameter();
-            queryParams.ContainerTypeField = String.Empty; // AzureBackupContainerType.IaasVMContainer.ToString();
+            queryParams.ContainerTypeField = AzureBackupContainerType.IaasVMContainer.ToString();
             queryParams.ContainerStatusField = String.Empty;
-            //            queryParams.ContainerFriendlyNameField = vmName;
-            queryParams.ContainerFriendlyNameField = String.Empty;
+            queryParams.ContainerFriendlyNameField = vmName;
             string queryString = GetQueryFileter(queryParams);
 
             ListContainerResponse containers = AzureBackupClient.Container.ListAsync(queryString,

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

@@ -33,52 +33,19 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
     [Cmdlet(VerbsLifecycle.Unregister, "AzureBackupContainer"), OutputType(typeof(Guid))]
     public class UnregisterAzureBackupContainer : AzureBackupVaultCmdletBase
     {
-        [Parameter(Position = 2, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.VirtualMachine)]
+        [Parameter(Position = 2, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.VirtualMachine, ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
-        public PSVirtualMachineInstanceView VirtualMachine { get; set; }
+        public string ContainerUniqueName { get; set; }
 
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
             ExecutionBlock(() =>
             {
-                string vmName = VirtualMachine.Name;
-                string rgName = VirtualMachine.ResourceGroupName;
-                Guid jobId = Guid.Empty;
-
-                ListContainerQueryParameter queryParams = new ListContainerQueryParameter();
-                queryParams.ContainerTypeField = AzureBackupContainerType.IaasVMContainer.ToString();
-                queryParams.ContainerStatusField = AzureBackupContainerRegistrationStatus.Registered.ToString();
-                queryParams.ContainerFriendlyNameField = vmName;
-
-                string queryString = GetQueryFileter(queryParams);
-
-                ListContainerResponse containers =
-                AzureBackupClient.Container.ListAsync(queryString, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-                if(containers.Objects.Count() == 0)
-                {
-                    WriteVerbose("Container is not in the registered list");
-                    jobId = Guid.Empty;
-                }
-                
-                else
-                {
-                    //We can havemultiple container with same friendly name.
-                    //Look for resourceGroup name in the ParentFriendlyName
-                    ContainerInfo containerToUnreg = containers.Objects.Where(c => c.ParentContainerFriendlyName.ToLower().Equals(rgName.ToLower())).FirstOrDefault();
-                    if (containerToUnreg == null)
-                    {
-                        //Container is not in list of registered container
-                        jobId = Guid.Empty;
-                    }
-                    else
-                    {
-                        UnregisterContainerRequest unregRequest = new UnregisterContainerRequest(containerToUnreg.Name, AzureBackupContainerType.IaasVMContainer.ToString()); 
-                        MBS.OperationResponse operationResponse = AzureBackupClient.Container.UnregisterAsync(unregRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-                        jobId = operationResponse.OperationId; //TODO: Fix it once PiyushKa publish the rest APi to get jobId based on operationId                        
-                    }
-                }
+                UnregisterContainerRequestInput unregRequest = new UnregisterContainerRequestInput(ContainerUniqueName, AzureBackupContainerType.IaasVMContainer.ToString());
+                MBS.OperationResponse operationResponse = AzureBackupClient.Container.UnregisterAsync(unregRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+                Guid jobId = operationResponse.OperationId; //TODO: Fix it once PiyushKa publish the rest APi to get jobId based on operationId                        
 
                 WriteObject(jobId);
             });