Skip to content
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

[AutoPR compute/resource-manager] [Compute] add zone and rolling upgrade. #2324

Merged
merged 1 commit into from
Aug 20, 2018
Merged

[AutoPR compute/resource-manager] [Compute] add zone and rolling upgrade. #2324

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
4 changes: 2 additions & 2 deletions ...2_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.compute.v2017_12_01.implementation.ComputeManager;
import com.microsoft.azure.SubResource;
import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineScaleSetVMInstanceViewInner;
import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInstanceViewInner;
import java.util.List;
import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInner;

Expand Down Expand Up @@ -50,7 +50,7 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
/**
* @return the instanceView value.
*/
VirtualMachineScaleSetVMInstanceView instanceView();
VirtualMachineInstanceView instanceView();

/**
* @return the licenseType value.
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public interface VirtualMachineScaleSetVM extends HasInner<VirtualMachineScaleSe
/**
* @return the instanceView value.
*/
VirtualMachineInstanceView instanceView();
VirtualMachineScaleSetVMInstanceView instanceView();

/**
* @return the latestModelApplied value.
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
package com.microsoft.azure.management.compute.v2017_12_01;

import com.microsoft.azure.SubResource;
import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineScaleSetVMInstanceViewInner;
import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInstanceViewInner;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.microsoft.rest.serializer.JsonFlatten;
Expand Down Expand Up @@ -89,7 +89,7 @@ public class VirtualMachineUpdate extends UpdateResource {
* The virtual machine instance view.
*/
@JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
private VirtualMachineScaleSetVMInstanceViewInner instanceView;
private VirtualMachineInstanceViewInner instanceView;

/**
* Specifies that the image or disk that is being used was licensed
Expand Down Expand Up @@ -280,7 +280,7 @@ public String provisioningState() {
*
* @return the instanceView value
*/
public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
public VirtualMachineInstanceViewInner instanceView() {
return this.instanceView;
}

Expand Down
8 changes: 4 additions & 4 deletions ...com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.microsoft.azure.management.compute.v2017_12_01.NetworkProfile;
import com.microsoft.azure.management.compute.v2017_12_01.DiagnosticsProfile;
import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineIdentity;
import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineScaleSetVMInstanceView;
import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineInstanceView;
import java.util.ArrayList;
import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtension;
import rx.functions.Func1;
Expand Down Expand Up @@ -97,10 +97,10 @@ public VirtualMachineIdentity identity() {
}

@Override
public VirtualMachineScaleSetVMInstanceView instanceView() {
VirtualMachineScaleSetVMInstanceViewInner inner = this.inner().instanceView();
public VirtualMachineInstanceView instanceView() {
VirtualMachineInstanceViewInner inner = this.inner().instanceView();
if (inner != null) {
return new VirtualMachineScaleSetVMInstanceViewImpl(inner, manager());
return new VirtualMachineInstanceViewImpl(inner, manager());
} else {
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions ...om/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class VirtualMachineInner extends Resource {
* The virtual machine instance view.
*/
@JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
private VirtualMachineScaleSetVMInstanceViewInner instanceView;
private VirtualMachineInstanceViewInner instanceView;

/**
* Specifies that the image or disk that is being used was licensed
Expand Down Expand Up @@ -293,7 +293,7 @@ public String provisioningState() {
*
* @return the instanceView value
*/
public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
public VirtualMachineInstanceViewInner instanceView() {
return this.instanceView;
}

Expand Down
8 changes: 4 additions & 4 deletions ...oft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.microsoft.azure.SubResource;
import com.microsoft.azure.management.compute.v2017_12_01.Plan;
import java.util.List;
import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineInstanceView;
import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineScaleSetVMInstanceView;
import java.util.ArrayList;
import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtension;

Expand Down Expand Up @@ -107,10 +107,10 @@ public String instanceId() {
}

@Override
public VirtualMachineInstanceView instanceView() {
VirtualMachineInstanceViewInner inner = this.inner().instanceView();
public VirtualMachineScaleSetVMInstanceView instanceView() {
VirtualMachineScaleSetVMInstanceViewInner inner = this.inner().instanceView();
if (inner != null) {
return new VirtualMachineInstanceViewImpl(inner, manager());
return new VirtualMachineScaleSetVMInstanceViewImpl(inner, manager());
} else {
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class VirtualMachineScaleSetVMInner extends Resource {
* The virtual machine instance view.
*/
@JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
private VirtualMachineInstanceViewInner instanceView;
private VirtualMachineScaleSetVMInstanceViewInner instanceView;

/**
* Specifies the hardware settings for the virtual machine.
Expand Down Expand Up @@ -185,7 +185,7 @@ public String vmId() {
*
* @return the instanceView value
*/
public VirtualMachineInstanceViewInner instanceView() {
public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
return this.instanceView;
}

Expand Down
4 changes: 1 addition & 3 deletions ...ava/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@
package com.microsoft.azure.management.compute.v2018_04_01.implementation;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.microsoft.rest.serializer.JsonFlatten;

/**
* A disk access SAS uri.
*/
@JsonFlatten
public class AccessUriInner {
/**
* A SAS uri for accessing a disk.
*/
@JsonProperty(value = "properties.output.accessSAS", access = JsonProperty.Access.WRITE_ONLY)
@JsonProperty(value = "accessSAS", access = JsonProperty.Access.WRITE_ONLY)
private String accessSAS;

/**
Expand Down