Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,89 @@ public void CopyStartSnapshotPositiveTest()
}

}

/// <summary>
/// positive test for testing UploadPreparedSecure disk
/// </summary>
[Fact]
public void DiskWithUploadPreparedSecureCreateOptionTest()
{
using (MockContext context = MockContext.Start(this.GetType()))
{
EnsureClientsInitialized(context);

var rgName = TestUtilities.GenerateName(TestPrefix);
var diskName = TestUtilities.GenerateName(DiskNamePrefix);

Disk disk = GenerateDefaultDisk(DiskCreateOption.UploadPreparedSecure, rgName, 32767);
disk.SecurityProfile = new DiskSecurityProfile { SecurityType = DiskSecurityTypes.ConfidentialVMDiskEncryptedWithCustomerKey };
disk.Location = DiskRPLocation;
disk.SecurityProfile.SecureVMDiskEncryptionSetId = "/subscriptions/0296790d-427c-48ca-b204-8b729bbd8670/resourceGroups/longrunningrg-centraluseuap/providers/Microsoft.Compute/diskEncryptionSets/cvm-des3";
try
{
m_ResourcesClient.ResourceGroups.CreateOrUpdate(rgName, new ResourceGroup { Location = DiskRPLocation });

//put disk
m_CrpClient.Disks.CreateOrUpdate(rgName, diskName, disk);
Disk diskOut = m_CrpClient.Disks.Get(rgName, diskName);

Validate(disk, diskOut, disk.Location);
Assert.Equal(disk.CreationData.CreateOption, diskOut.CreationData.CreateOption);
Assert.NotNull(diskOut.SecurityProfile);
Assert.Equal(disk.SecurityProfile.SecurityType, diskOut.SecurityProfile.SecurityType);
Assert.Equal(disk.SecurityProfile.SecureVMDiskEncryptionSetId, diskOut.SecurityProfile.SecureVMDiskEncryptionSetId);
m_CrpClient.Disks.Delete(rgName, diskName);
}
finally
{
m_ResourcesClient.ResourceGroups.Delete(rgName);
}
}
}

/// <summary>
/// positive test for testing ImportSecure disk
/// </summary>
[Fact]
public void DiskWithImportSecureCreateOptionTest()
{
using (MockContext context = MockContext.Start(this.GetType()))
{
EnsureClientsInitialized(context);

var rgName = TestUtilities.GenerateName(TestPrefix);
var diskName = TestUtilities.GenerateName(DiskNamePrefix);

Disk disk = GenerateBaseDisk(DiskCreateOption.ImportSecure);
disk.OsType = OperatingSystemTypes.Windows;
disk.CreationData.SourceUri = "https://swaggeraccount.blob.core.windows.net/swagger/abcd.vhd";
disk.CreationData.SecurityDataUri = "https://swaggeraccount.blob.core.windows.net/swagger/vmgs.vhd";
disk.CreationData.StorageAccountId = "/subscriptions/0296790d-427c-48ca-b204-8b729bbd8670/resourceGroups/longrunningrg-centraluseuap/providers/Microsoft.Storage/storageAccounts/swaggeraccount";

disk.SecurityProfile = new DiskSecurityProfile { SecurityType = DiskSecurityTypes.TrustedLaunch };
disk.HyperVGeneration = HyperVGeneration.V2;
disk.Location = DiskRPLocation;
try
{
m_ResourcesClient.ResourceGroups.CreateOrUpdate(rgName, new ResourceGroup { Location = DiskRPLocation });

//put disk
m_CrpClient.Disks.CreateOrUpdate(rgName, diskName, disk);
Disk diskOut = m_CrpClient.Disks.Get(rgName, diskName);

Validate(disk, diskOut, disk.Location);
Assert.Equal(disk.CreationData.CreateOption, diskOut.CreationData.CreateOption);
Assert.NotNull(diskOut.SecurityProfile);
Assert.Equal(disk.CreationData.SecurityDataUri, diskOut.CreationData.SecurityDataUri);
Assert.Equal(disk.SecurityProfile.SecurityType, diskOut.SecurityProfile.SecurityType);
m_CrpClient.Disks.Delete(rgName, diskName);
}
finally
{
m_ResourcesClient.ResourceGroups.Delete(rgName);
}
}
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ public void DiskEncryptionSet_CRUD_EncryptionWithPlatformAndCustomerKeys()
DiskEncryptionSet_CRUD_Execute("DiskEncryptionSet_CRUD_EncryptionWithPlatformAndCustomerKeys", DiskEncryptionSetType.EncryptionAtRestWithPlatformAndCustomerKeys, location: supportedZoneLocation);
}

[Fact]
public void DiskEncryptionSet_CRUD_ConfidentialVmEncryptedWithCustomerKey()
{
DiskEncryptionSet_CRUD_Execute("DiskEncryptionSet_CRUD_ConfidentialVmEncryptedWithCustomerKey", DiskEncryptionSetType.ConfidentialVmEncryptedWithCustomerKey, location: supportedZoneLocation);
}

[Fact]
public void DiskEncryptionSet_List()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ public void IncrementalSnapshot_CRUD_EmptyDisk()
Snapshot_CRUD_Execute(DiskCreateOption.Empty, "IncrementalSnapshot_CRUD_EmptyDisk", diskSizeGB: 5, incremental: true, location: "centraluseuap");
}

[Fact]
public void Snapshot_CRUD_WithSecurityType()
{
Snapshot_CRUD_WithSecurityType_Execute("Snapshot_CRUD_WithSecurityType", location: "eastus2");
}

[Fact]
public void Disk_List_EmptyDisk()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,55 @@ protected void Snapshot_CRUD_Execute(string diskCreateOption, string methodName,

}

protected void Snapshot_CRUD_WithSecurityType_Execute(string methodName, string location)
{
using (MockContext context = MockContext.Start(this.GetType(), methodName))
{
EnsureClientsInitialized(context);

var rgName = TestUtilities.GenerateName(TestPrefix);
var diskName = TestUtilities.GenerateName(DiskNamePrefix);
var snapshotName = TestUtilities.GenerateName(DiskNamePrefix);

Disk disk = GenerateBaseDisk(DiskCreateOption.FromImage);
disk.Location = location;
disk.OsType = OperatingSystemTypes.Linux;
disk.CreationData.ImageReference = new ImageDiskReference
{
Id = "/Subscriptions/0296790d-427c-48ca-b204-8b729bbd8670/Providers/Microsoft.Compute/Locations/EASTUS2/Publishers/Canonical/ArtifactTypes/VMImage/Offers/UbuntuServer/Skus/18_04-lts-gen2/Versions/latest"
};
disk.SecurityProfile = new DiskSecurityProfile { SecurityType = DiskSecurityTypes.TrustedLaunch };

try
{
m_ResourcesClient.ResourceGroups.CreateOrUpdate(rgName, new ResourceGroup { Location = location });

//put disk
m_CrpClient.Disks.CreateOrUpdate(rgName, diskName, disk);
Disk diskOut = m_CrpClient.Disks.Get(rgName, diskName);

Validate(disk, diskOut, disk.Location);

// Generate snapshot using disk info
Snapshot snapshot = GenerateDefaultSnapshot(diskOut.Id, location: location);

// **********
// TEST
// **********

Snapshot snapshotOut = m_CrpClient.Snapshots.CreateOrUpdate(rgName, snapshotName, snapshot);
Validate(snapshot, snapshotOut);
Assert.NotNull(snapshotOut.SecurityProfile);
Assert.Equal(disk.SecurityProfile.SecurityType, snapshotOut.SecurityProfile.SecurityType);
OperateSnapshot(snapshot, rgName, snapshotName);
}
finally
{
m_ResourcesClient.ResourceGroups.Delete(rgName);
}
}
}

protected void DiskEncryptionSet_CRUD_Execute(string methodName, string encryptionType, string location = null)
{
using (MockContext context = MockContext.Start(this.GetType(), methodName))
Expand Down Expand Up @@ -1130,6 +1179,16 @@ protected void Disk_CRUD_WithSecurityProfile_Execute(string diskCreateOption, st
Validate(disk, diskOut, DiskRPLocation);
Assert.Equal(disk.SecurityProfile.SecurityType, diskOut.SecurityProfile.SecurityType);

// Begin get access with VmGuestStateSas
GrantAccessData accessData = AccessDataDefault;
accessData.GetSecureVMGuestStateSAS = true;
AccessUri accessUri = m_CrpClient.Disks.GrantAccess(rgName, diskName, accessData);
Assert.NotNull(accessUri.AccessSAS);
Assert.NotNull(accessUri.SecurityDataAccessSAS);

// End disk access
m_CrpClient.Disks.RevokeAccess(rgName, diskName);

// Delete
m_CrpClient.Disks.Delete(rgName, diskName);

Expand Down Expand Up @@ -1431,6 +1490,7 @@ protected Disk GenerateDefaultDisk(string diskCreateOption, string rgName, int?
switch (diskCreateOption)
{
case "Upload":
case "UploadPreparedSecure":
disk = GenerateBaseDisk(diskCreateOption, location);
disk.CreationData.UploadSizeBytes = (long) (diskSizeGB ?? 10) * 1024 * 1024 * 1024 + 512;
break;
Expand All @@ -1440,6 +1500,7 @@ protected Disk GenerateDefaultDisk(string diskCreateOption, string rgName, int?
disk.Zones = zones;
break;
case "Import":
case "ImportSecure":
disk = GenerateImportDisk(diskCreateOption, rgName, location);
disk.DiskSizeGB = diskSizeGB;
disk.Zones = zones;
Expand Down
Loading