Skip to content

support withBootDiagnosticsOnManagedStorageAccount #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weidongxu-microsoft merged 1 commit into from
Mar 4, 2021
Merged

support withBootDiagnosticsOnManagedStorageAccount #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1650,6 +1650,14 @@ interface WithPlan {
* The stage of the virtual machine definition allowing to enable boot diagnostics.
*/
interface WithBootDiagnostics {
/**
* Specifies that boot diagnostics needs to be enabled in the virtual machine.
* Managed storage account is used.
*
* @return the next stage of the definition
*/
WithCreate withBootDiagnosticsOnManagedStorageAccount();

/**
* Specifies that boot diagnostics needs to be enabled in the virtual machine.
*
Expand Down Expand Up @@ -2221,6 +2229,14 @@ interface WithExtension {
* The stage of the virtual machine definition allowing to enable boot diagnostics.
*/
interface WithBootDiagnostics {
/**
* Specifies that boot diagnostics needs to be enabled in the virtual machine.
* Managed storage account is used.
*
* @return the next stage of the update
*/
Update withBootDiagnosticsOnManagedStorageAccount();

/**
* Specifies that boot diagnostics needs to be enabled in the virtual machine.
*
Expand Down
20 changes: 18 additions & 2 deletions ...c/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,9 +1391,15 @@ public VirtualMachineImpl withUnmanagedDisks() {
return this;
}

@Override
public VirtualMachineImpl withBootDiagnosticsOnManagedStorageAccount() {
this.bootDiagnosticsHandler.withBootDiagnostics(true);
return this;
}

@Override
public VirtualMachineImpl withBootDiagnostics() {
this.bootDiagnosticsHandler.withBootDiagnostics();
this.bootDiagnosticsHandler.withBootDiagnostics(false);
return this;
}

Expand Down Expand Up @@ -2733,6 +2739,7 @@ private StorageAccountTypes getDefaultStorageAccountType() {
private class BootDiagnosticsHandler {
private final VirtualMachineImpl vmImpl;
private String creatableDiagnosticsStorageAccountKey;
private boolean useManagedStorageAccount = false;

BootDiagnosticsHandler(VirtualMachineImpl vmImpl) {
this.vmImpl = vmImpl;
Expand All @@ -2756,10 +2763,11 @@ public String bootDiagnosticsStorageUri() {
return null;
}

BootDiagnosticsHandler withBootDiagnostics() {
BootDiagnosticsHandler withBootDiagnostics(boolean useManagedStorageAccount) {
// Diagnostics storage uri will be set later by this.handleDiagnosticsSettings(..)
//
this.enableDisable(true);
this.useManagedStorageAccount = useManagedStorageAccount;
return this;
}

Expand All @@ -2773,6 +2781,7 @@ BootDiagnosticsHandler withBootDiagnostics(Creatable<StorageAccount> creatable)

BootDiagnosticsHandler withBootDiagnostics(String storageAccountBlobEndpointUri) {
this.enableDisable(true);
this.useManagedStorageAccount = false;
this.vmInner()
.diagnosticsProfile()
.bootDiagnostics()
Expand All @@ -2786,10 +2795,14 @@ BootDiagnosticsHandler withBootDiagnostics(StorageAccount storageAccount) {

BootDiagnosticsHandler withoutBootDiagnostics() {
this.enableDisable(false);
this.useManagedStorageAccount = false;
return this;
}

void prepare() {
if (useManagedStorageAccount) {
return;
}
DiagnosticsProfile diagnosticsProfile = this.vmInner().diagnosticsProfile();
if (diagnosticsProfile == null
|| diagnosticsProfile.bootDiagnostics() == null
Expand Down Expand Up @@ -2822,6 +2835,9 @@ void prepare() {
}

void handleDiagnosticsSettings() {
if (useManagedStorageAccount) {
return;
}
DiagnosticsProfile diagnosticsProfile = this.vmInner().diagnosticsProfile();
if (diagnosticsProfile == null
|| diagnosticsProfile.bootDiagnostics() == null
Expand Down