Dummy

src/ResourceManagement/RecoveryServices.Backup/RecoveryServices.Tests/ScenarioTests/AzureIaasVMTests/RestoreTests.cs

@@ -48,26 +48,29 @@ public void RestoreDiskTest()
                 string itemType = ConfigurationManager.AppSettings["IaaSVMItemType"];
                 string recoveryPointId = ConfigurationManager.AppSettings["RecoveryPointName"];
                 string storageAccountId = ConfigurationManager.AppSettings["StorageAccountId"];
+                string sourceResourceId = ConfigurationManager.AppSettings["SourceVmIdForRestore"];
 
                 var client = GetServiceClient<RecoveryServicesBackupManagementClient>(resourceNamespace);
 
                 string resourceGroupName = ConfigurationManager.AppSettings["RsVaultRgNameRestore"];
                 string resourceName = ConfigurationManager.AppSettings["RsVaultNameRestore"];
                 string containerUri = containeType + ";" + containerUniqueName;
                 string itemUri = itemType + ";" + itemUniqueName;
-
+                
                 IaasVMRestoreRequest restoreRequest = new IaasVMRestoreRequest()
                 {
                     AffinityGroup = String.Empty,
-                    CloudServiceOrResourceGroup = String.Empty,
                     CreateNewCloudService = false,
                     RecoveryPointId = recoveryPointId,
                     RecoveryType = RecoveryType.RestoreDisks,
                     Region = vaultLocation,
                     StorageAccountId = storageAccountId,
                     SubnetId = string.Empty,
-                    VirtualMachineName = string.Empty,
                     VirtualNetworkId = string.Empty,
+                    SourceResourceId = sourceResourceId,
+                    TargetDomainNameId = string.Empty,
+                    TargetResourceGroupId = string.Empty,
+                    TargetVirtualMachineId = string.Empty,
                 };
 
                 TriggerRestoreRequest triggerRestoreRequest = new TriggerRestoreRequest();

src/ResourceManagement/RecoveryServices.Backup/RecoveryServices.Tests/SessionRecords/RecoveryServices.Tests.RestoreDiskTests/RestoreDiskTest.json

@@ -1,19 +1,19 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d22f872b-f3f1-425a-8100-c74a376452b1/resourceGroups/restorerg1/providers/Microsoft.RecoveryServices/vaults/restorern1/backupFabrics/Azure/protectionContainers/IaasVMContainer%3Biaasvmcontainerv2%3Bshswain-rg1%3Bshswain-vm1/protectedItems/vm%3Biaasvmcontainerv2%3Bshswain-rg1%3Bshswain-vm1/recoveryPoints/23864730435904/restore?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDIyZjg3MmItZjNmMS00MjVhLTgxMDAtYzc0YTM3NjQ1MmIxL3Jlc291cmNlR3JvdXBzL3Jlc3RvcmVyZzEvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2VzL3ZhdWx0cy9yZXN0b3Jlcm4xL2JhY2t1cEZhYnJpY3MvQXp1cmUvcHJvdGVjdGlvbkNvbnRhaW5lcnMvSWFhc1ZNQ29udGFpbmVyJTNCaWFhc3ZtY29udGFpbmVydjIlM0JzaHN3YWluLXJnMSUzQnNoc3dhaW4tdm0xL3Byb3RlY3RlZEl0ZW1zL3ZtJTNCaWFhc3ZtY29udGFpbmVydjIlM0JzaHN3YWluLXJnMSUzQnNoc3dhaW4tdm0xL3JlY292ZXJ5UG9pbnRzLzIzODY0NzMwNDM1OTA0L3Jlc3RvcmU/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
+      "RequestUri": "/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/shankcanaryrg/providers/Microsoft.RecoveryServices/vaults/shankcanary2/backupFabrics/Azure/protectionContainers/IaasVMContainer%3Biaasvmcontainerv2%3Bshraccanrg%3Bshraccanv2/protectedItems/vm%3Biaasvmcontainerv2%3Bshraccanrg%3Bshraccanv2/recoveryPoints/30641628955971/restore?api-version=2016-05-01",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjJlZGZkNWQtNTQ5Ni00NjgzLWI5NGYtYjM1ODhjNTc5MDA5L3Jlc291cmNlR3JvdXBzL3NoYW5rY2FuYXJ5cmcvcHJvdmlkZXJzL01pY3Jvc29mdC5SZWNvdmVyeVNlcnZpY2VzL3ZhdWx0cy9zaGFua2NhbmFyeTIvYmFja3VwRmFicmljcy9BenVyZS9wcm90ZWN0aW9uQ29udGFpbmVycy9JYWFzVk1Db250YWluZXIlM0JpYWFzdm1jb250YWluZXJ2MiUzQnNocmFjY2FucmclM0JzaHJhY2NhbnYyL3Byb3RlY3RlZEl0ZW1zL3ZtJTNCaWFhc3ZtY29udGFpbmVydjIlM0JzaHJhY2NhbnJnJTNCc2hyYWNjYW52Mi9yZWNvdmVyeVBvaW50cy8zMDY0MTYyODk1NTk3MS9yZXN0b3JlP2FwaS12ZXJzaW9uPTIwMTYtMDUtMDE=",
       "RequestMethod": "POST",
-      "RequestBody": "{\r\n  \"properties\": {\r\n    \"objectType\": \"IaasVMRestoreRequest\",\r\n    \"recoveryPointId\": \"23864730435904\",\r\n    \"recoveryType\": \"RestoreDisks\",\r\n    \"storageAccountId\": \"/subscriptions/d22f872b-f3f1-425a-8100-c74a376452b1/resourceGroups/mkheranirestorestrtest/providers/Microsoft.Storage/storageAccounts/mkheranirestorestrtest1\",\r\n    \"virtualMachineName\": \"\",\r\n    \"createNewCloudService\": false,\r\n    \"cloudServiceOrResourceGroup\": \"\",\r\n    \"virtualNetworkId\": \"\",\r\n    \"region\": \"westus\",\r\n    \"affinityGroup\": \"\",\r\n    \"subnetId\": \"\"\r\n  }\r\n}",
+      "RequestBody": "{\r\n  \"properties\": {\r\n    \"objectType\": \"IaasVMRestoreRequest\",\r\n    \"recoveryPointId\": \"30641628955971\",\r\n    \"recoveryType\": \"RestoreDisks\",\r\n    \"storageAccountId\": \"/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/shraccanrg/providers/Microsoft.Storage/storageAccounts/shraccanseastorv2\",\r\n    \"createNewCloudService\": false,\r\n    \"virtualNetworkId\": \"\",\r\n    \"region\": \"southeastasia\",\r\n    \"affinityGroup\": \"\",\r\n    \"subnetId\": \"\",\r\n    \"sourceResourceId\": \"/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/shraccanrg/providers/Microsoft.Compute/virtualMachines/shraccanv2\",\r\n    \"targetVirtualMachineId\": \"\",\r\n    \"targetResourceGroupId\": \"\",\r\n    \"targetDomainNameId\": \"\"\r\n  }\r\n}",
       "RequestHeaders": {
         "Content-Type": [
           "application/json"
         ],
         "Content-Length": [
-          "544"
+          "723"
         ],
         "x-ms-client-request-id": [
-          "9bc11f0a-e1c9-4240-92be-bf8256d6c903"
+          "f34af667-1a49-4d3f-b42c-47682a3a8962"
         ],
         "User-Agent": [
           "Microsoft.Azure.Management.RecoveryServices.Backup.RecoveryServicesBackupManagementClient/0.9.0.0"
@@ -34,35 +34,35 @@
           "30"
         ],
         "Azure-AsyncOperation": [
-          "https://api-dogfood.resources.windows-int.net/subscriptions/d22f872b-f3f1-425a-8100-c74a376452b1/resourceGroups/restorerg1/providers/Microsoft.RecoveryServices/vaults/restorern1/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;shswain-rg1;shswain-vm1/protectedItems/vm;iaasvmcontainerv2;shswain-rg1;shswain-vm1/operationsStatus/c623f7ff-192f-4cb5-8187-cc7b02e22562?api-version=2016-05-01"
+          "https://management.azure.com/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/shankcanaryrg/providers/Microsoft.RecoveryServices/vaults/shankcanary2/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;shraccanrg;shraccanv2/protectedItems/vm;iaasvmcontainerv2;shraccanrg;shraccanv2/operationsStatus/74c08606-a88f-4a54-9314-9d6962c98d01?api-version=2016-05-01"
         ],
         "x-ms-request-id": [
-          "c14afa3b-ef14-49e3-b0d0-26578a31fd9e"
+          "ca6a6f3f-8e5e-4383-8563-302055678934"
         ],
         "x-ms-client-request-id": [
-          "9bc11f0a-e1c9-4240-92be-bf8256d6c903",
-          "9bc11f0a-e1c9-4240-92be-bf8256d6c903"
+          "f34af667-1a49-4d3f-b42c-47682a3a8962",
+          "f34af667-1a49-4d3f-b42c-47682a3a8962"
         ],
         "Strict-Transport-Security": [
           "max-age=31536000; includeSubDomains"
         ],
         "x-ms-ratelimit-remaining-subscription-writes": [
-          "1198"
+          "1199"
         ],
         "x-ms-correlation-request-id": [
-          "c14afa3b-ef14-49e3-b0d0-26578a31fd9e"
+          "ca6a6f3f-8e5e-4383-8563-302055678934"
         ],
         "x-ms-routing-request-id": [
-          "CENTRALUS:20160418T155936Z:c14afa3b-ef14-49e3-b0d0-26578a31fd9e"
+          "SOUTHINDIA:20160614T152621Z:ca6a6f3f-8e5e-4383-8563-302055678934"
         ],
         "Cache-Control": [
           "no-cache"
         ],
         "Date": [
-          "Mon, 18 Apr 2016 15:59:35 GMT"
+          "Tue, 14 Jun 2016 15:26:20 GMT"
         ],
         "Location": [
-          "https://api-dogfood.resources.windows-int.net/subscriptions/d22f872b-f3f1-425a-8100-c74a376452b1/resourceGroups/restorerg1/providers/Microsoft.RecoveryServices/vaults/restorern1/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;shswain-rg1;shswain-vm1/protectedItems/vm;iaasvmcontainerv2;shswain-rg1;shswain-vm1/operationResults/c623f7ff-192f-4cb5-8187-cc7b02e22562?api-version=2016-05-01"
+          "https://management.azure.com/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/shankcanaryrg/providers/Microsoft.RecoveryServices/vaults/shankcanary2/backupFabrics/Azure/protectionContainers/IaasVMContainer;iaasvmcontainerv2;shraccanrg;shraccanv2/protectedItems/vm;iaasvmcontainerv2;shraccanrg;shraccanv2/operationResults/74c08606-a88f-4a54-9314-9d6962c98d01?api-version=2016-05-01"
         ],
         "X-Powered-By": [
           "ASP.NET"
@@ -73,6 +73,6 @@
   ],
   "Names": {},
   "Variables": {
-    "SubscriptionId": "d22f872b-f3f1-425a-8100-c74a376452b1"
+    "SubscriptionId": "f2edfd5d-5496-4683-b94f-b3588c579009"
   }
 }

src/ResourceManagement/RecoveryServices.Backup/RecoveryServices.Tests/app.config

@@ -25,14 +25,15 @@
     <add key="ClientSettingsProvider.ServiceUri" value="" />
 
 	<!-- Restore related -->
-	  <add key="RsVaultRgNameRestore" value="restorerg1" />
-    <add key="RsVaultNameRestore" value="restorern1" />
-    <add key="RsVaultIaasVMContainerUniqueNameRestore" value="iaasvmcontainerv2;shswain-rg1;shswain-vm1" />
-    <add key="RsVaultIaasVMItemUniqueNameRestore" value="iaasvmcontainerv2;shswain-rg1;shswain-vm1" />
-    <add key="vaultLocation" value="westus" />
-    <add key="RecoveryPointName" value="23864730435904" />
-    <add key="StorageAccountId" value="/subscriptions/d22f872b-f3f1-425a-8100-c74a376452b1/resourceGroups/mkheranirestorestrtest/providers/Microsoft.Storage/storageAccounts/mkheranirestorestrtest1" />
-
+    <add key="RsVaultRgNameRestore" value="shankcanaryrg" />
+    <add key="RsVaultNameRestore" value="shankcanary2" />
+    <add key="RsVaultIaasVMContainerUniqueNameRestore" value="iaasvmcontainerv2;shraccanrg;shraccanv2" />
+    <add key="RsVaultIaasVMItemUniqueNameRestore" value="iaasvmcontainerv2;shraccanrg;shraccanv2" />
+    <add key="vaultLocation" value="southeastasia" />
+    <add key="RecoveryPointName" value="30641628955971" />
+    <add key="StorageAccountId" value="/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/shraccanrg/providers/Microsoft.Storage/storageAccounts/shraccanseastorv2" />
+    <add key="SourceVmIdForRestore" value="/subscriptions/f2edfd5d-5496-4683-b94f-b3588c579009/resourceGroups/shraccanrg/providers/Microsoft.Compute/virtualMachines/shraccanv2" />
+
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">

src/ResourceManagement/RecoveryServices.Backup/RecoveryServicesBackupManagement/Generated/Models/IaasVMRestoreRequest.cs

@@ -34,40 +34,14 @@ public partial class IaasVMRestoreRequest : RestoreRequest
 
         /// <summary>
         /// Optional. Affinity group to which the VM should be restored to.
+        /// Used only for Classic Compute Virtual Machines.
         /// </summary>
         public string AffinityGroup
         {
             get { return this._affinityGroup; }
             set { this._affinityGroup = value; }
         }
 
-        private string _cloudServiceOrResourceGroup;
-
-        /// <summary>
-        /// Optional. Specifies either the cloud service name or the resource
-        /// group name to which the VM has to be restored to.If the VM is of
-        /// type Classic, this will be the cloud service name and resource
-        /// group name if it is a Compute VM.
-        /// </summary>
-        public string CloudServiceOrResourceGroup
-        {
-            get { return this._cloudServiceOrResourceGroup; }
-            set { this._cloudServiceOrResourceGroup = value; }
-        }
-
-        private string _cloudServiceOrResourceGroupId;
-
-        /// <summary>
-        /// Optional. Please use this only when the CreateNewCloudService is
-        /// set to false. The value should be the ID of the domain name  for
-        /// Classic VMs and ID of the resource group for Compute VMs.
-        /// </summary>
-        public string CloudServiceOrResourceGroupId
-        {
-            get { return this._cloudServiceOrResourceGroupId; }
-            set { this._cloudServiceOrResourceGroupId = value; }
-        }
-
         private bool _createNewCloudService;
 
         /// <summary>
@@ -116,6 +90,18 @@ public string Region
             set { this._region = value; }
         }
 
+        private string _sourceResourceId;
+
+        /// <summary>
+        /// Optional. Fully qualified ARM ID of the source VM which is being
+        /// recovered.
+        /// </summary>
+        public string SourceResourceId
+        {
+            get { return this._sourceResourceId; }
+            set { this._sourceResourceId = value; }
+        }
+
         private string _storageAccountId;
 
         /// <summary>
@@ -140,15 +126,41 @@ public string SubnetId
             set { this._subnetId = value; }
         }
 
-        private string _virtualMachineName;
+        private string _targetDomainNameId;
+
+        /// <summary>
+        /// Optional. Fully qualified ARM ID of the domain name to be used with
+        /// the VM being cretaed as part of the restore operation. This
+        /// applies only to Classic Virtual Machines.
+        /// </summary>
+        public string TargetDomainNameId
+        {
+            get { return this._targetDomainNameId; }
+            set { this._targetDomainNameId = value; }
+        }
+
+        private string _targetResourceGroupId;
+
+        /// <summary>
+        /// Optional. Fully qualified ARM ID of the resource group where the VM
+        /// has to be cretaed as part of the restore operation.
+        /// </summary>
+        public string TargetResourceGroupId
+        {
+            get { return this._targetResourceGroupId; }
+            set { this._targetResourceGroupId = value; }
+        }
+
+        private string _targetVirtualMachineId;
 
         /// <summary>
-        /// Optional. Name that the VM has to be restored to.
+        /// Optional. Fully qualified ARM ID of the VM to be cretaed as part of
+        /// the restore operation.
         /// </summary>
-        public string VirtualMachineName
+        public string TargetVirtualMachineId
         {
-            get { return this._virtualMachineName; }
-            set { this._virtualMachineName = value; }
+            get { return this._targetVirtualMachineId; }
+            set { this._targetVirtualMachineId = value; }
         }
 
         private string _virtualNetworkId;

src/ResourceManagement/RecoveryServices.Backup/RecoveryServicesBackupManagement/Generated/Models/ProtectedItem.cs

@@ -66,6 +66,17 @@ public string PolicyId
             set { this._policyId = value; }
         }
 
+        private string _sourceResourceId;
+
+        /// <summary>
+        /// Optional. ARM ID of the resource to be protected.
+        /// </summary>
+        public string SourceResourceId
+        {
+            get { return this._sourceResourceId; }
+            set { this._sourceResourceId = value; }
+        }
+
         private string _workloadType;
 
         /// <summary>