Skip to content

Commit

Permalink
CodeGen from PR 10923 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 76eb082e8ea67920eeeb9109b800807e806944ed into 7a12c790e38511254ef33b3c6e15260107bd2b1e
  • Loading branch information
SDKAuto committed Dec 1, 2020
1 parent 33362b5 commit 82a40c6
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 35 deletions.
4 changes: 2 additions & 2 deletions sdk/compute/mgmt-v2019_07_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.3.2</version>
<relativePath>../../parents/azure-arm-parent/pom.xml</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-compute</artifactId>
<version>1.0.0-beta</version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Indexable
/**
* The entirety of the VirtualMachine definition.
*/
interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate {
interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
}

/**
Expand All @@ -172,15 +172,15 @@ interface Blank extends WithLocation {
}

/**
* The stage of the virtualmachine definition allowing to specify resource group.
* The stage of the virtualmachine definition allowing to specify Location.
*/
interface WithResourceGroup {
interface WithLocation {
/**
* Specifies resourceGroupName.
* @param resourceGroupName The name of the resource group
* @return the next definition stage
*/
WithLocation withExistingResourceGroup(String resourceGroupName);
WithLocation withExistingLocation(String resourceGroupName);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public interface VirtualMachineScaleSetVMs extends HasInner<VirtualMachineScaleS
Completable redeployAsync(String resourceGroupName, String vmScaleSetName, String instanceId);

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public interface VirtualMachines {
Observable<VirtualMachineInstanceView> instanceViewAsync(String resourceGroupName, String vmName);

/**
* Converts virtual machine disks from blob-based to managed disks. Virtual machine must be stop-deallocated before invoking this operation.
* Converts virtual machine disks from blob-based to managed disks. Virtual machine must be stop-deallocated before invoking this operation. &lt;br&gt;For Windows, please refer to [Convert a virtual machine from unmanaged disks to managed disks.](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/convert-unmanaged-to-managed-disks).&lt;br&gt;For Linux, please refer to [Convert a virtual machine from unmanaged disks to managed disks.](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/convert-unmanaged-to-managed-disks).
*
* @param resourceGroupName The name of the resource group.
* @param vmName The name of the virtual machine.
Expand Down Expand Up @@ -165,7 +165,7 @@ public interface VirtualMachines {
Completable reimageAsync(String resourceGroupName, String vmName);

/**
* The operation to perform maintenance on a virtual machine.
* Shuts down the virtual machine, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmName The name of the virtual machine.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.microsoft.azure.management.compute.v2019_07_01.InstanceViewStatus;

class ProximityPlacementGroupImpl extends GroupableResourceCoreImpl<ProximityPlacementGroup, ProximityPlacementGroupInner, ProximityPlacementGroupImpl, ComputeManager> implements ProximityPlacementGroup, ProximityPlacementGroup.Definition, ProximityPlacementGroup.Update {
private Map<String, String> utags;
ProximityPlacementGroupImpl(String name, ProximityPlacementGroupInner inner, ComputeManager manager) {
super(name, inner, manager);
}
Expand All @@ -32,7 +33,7 @@ public Observable<ProximityPlacementGroup> createResourceAsync() {
@Override
public Observable<ProximityPlacementGroup> updateResourceAsync() {
ProximityPlacementGroupsInner client = this.manager().inner().proximityPlacementGroups();
return client.updateAsync(this.resourceGroupName(), this.name(), this.tags())
return client.updateAsync(this.resourceGroupName(), this.name(), this.utags)
.map(innerToFluentMap(this));
}

Expand Down Expand Up @@ -84,4 +85,11 @@ public ProximityPlacementGroupImpl withProximityPlacementGroupType(ProximityPlac
this.inner().withProximityPlacementGroupType(proximityPlacementGroupType);
return this;
}

@Override
public ProximityPlacementGroupImpl withTags(Map<String, String> tags) {
this.utags = tags;
return this;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public List<String> zones() {
}

@Override
public VirtualMachineImpl withExistingResourceGroup(String resourceGroupName) {
public VirtualMachineImpl withExistingLocation(String resourceGroupName) {
this.resourceGroupName = resourceGroupName;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2537,7 +2537,7 @@ private ServiceResponse<Void> beginRedeployDelegate(Response<ResponseBody> respo
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand All @@ -2551,7 +2551,7 @@ public void performMaintenance(String resourceGroupName, String vmScaleSetName,
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand All @@ -2565,7 +2565,7 @@ public ServiceFuture<Void> performMaintenanceAsync(String resourceGroupName, Str
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand All @@ -2583,7 +2583,7 @@ public Void call(ServiceResponse<Void> response) {
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand All @@ -2610,7 +2610,7 @@ public Observable<ServiceResponse<Void>> performMaintenanceWithServiceResponseAs
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand All @@ -2624,7 +2624,7 @@ public void beginPerformMaintenance(String resourceGroupName, String vmScaleSetN
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand All @@ -2638,7 +2638,7 @@ public ServiceFuture<Void> beginPerformMaintenanceAsync(String resourceGroupName
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand All @@ -2656,7 +2656,7 @@ public Void call(ServiceResponse<Void> response) {
}

/**
* Performs maintenance on a virtual machine in a VM scale set.
* Shuts down the virtual machine in a VMScaleSet, moves it to an already updated node, and powers it back on during the self-service phase of planned maintenance.
*
* @param resourceGroupName The name of the resource group.
* @param vmScaleSetName The name of the VM scale set.
Expand Down
Loading

0 comments on commit 82a40c6

Please sign in to comment.