Skip to content

Commit 5dc059c

Browse files
author
SDKAuto
committed
CodeGen from PR 11704 in Azure/azure-rest-api-specs
Merge 285800493b510bf0da60be96437040eeb566ea46 into f7fd049bbc0089ad8faa7dc1c89610ca8ad78c83
1 parent d267e4a commit 5dc059c

File tree

8 files changed

+43
-35
lines changed

8 files changed

+43
-35
lines changed

sdk/compute/mgmt-v2019_07_01/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<parent>
1212
<groupId>com.microsoft.azure</groupId>
1313
<artifactId>azure-arm-parent</artifactId>
14-
<version>1.3.2</version>
15-
<relativePath>../../parents/azure-arm-parent/pom.xml</relativePath>
14+
<version>1.1.0</version>
15+
<relativePath>../../../pom.management.xml</relativePath>
1616
</parent>
1717
<artifactId>azure-mgmt-compute</artifactId>
1818
<version>1.0.0-beta</version>

sdk/compute/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/compute/v2019_07_01/VirtualMachine.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Indexable
158158
/**
159159
* The entirety of the VirtualMachine definition.
160160
*/
161-
interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate {
161+
interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
162162
}
163163

164164
/**
@@ -172,15 +172,15 @@ interface Blank extends WithLocation {
172172
}
173173

174174
/**
175-
* The stage of the virtualmachine definition allowing to specify resource group.
175+
* The stage of the virtualmachine definition allowing to specify Location.
176176
*/
177-
interface WithResourceGroup {
177+
interface WithLocation {
178178
/**
179179
* Specifies resourceGroupName.
180180
* @param resourceGroupName The name of the resource group
181181
* @return the next definition stage
182182
*/
183-
WithLocation withExistingResourceGroup(String resourceGroupName);
183+
WithLocation withExistingLocation(String resourceGroupName);
184184
}
185185

186186
/**

sdk/compute/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/compute/v2019_07_01/VirtualMachineScaleSetVMs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public interface VirtualMachineScaleSetVMs extends HasInner<VirtualMachineScaleS
106106
Completable redeployAsync(String resourceGroupName, String vmScaleSetName, String instanceId);
107107

108108
/**
109-
* Performs maintenance on a virtual machine in a VM scale set.
109+
* 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.
110110
*
111111
* @param resourceGroupName The name of the resource group.
112112
* @param vmScaleSetName The name of the VM scale set.

sdk/compute/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/compute/v2019_07_01/VirtualMachines.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public interface VirtualMachines {
7575
Observable<VirtualMachineInstanceView> instanceViewAsync(String resourceGroupName, String vmName);
7676

7777
/**
78-
* Converts virtual machine disks from blob-based to managed disks. Virtual machine must be stop-deallocated before invoking this operation.
78+
* 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).
7979
*
8080
* @param resourceGroupName The name of the resource group.
8181
* @param vmName The name of the virtual machine.
@@ -165,7 +165,7 @@ public interface VirtualMachines {
165165
Completable reimageAsync(String resourceGroupName, String vmName);
166166

167167
/**
168-
* The operation to perform maintenance on a virtual machine.
168+
* 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.
169169
*
170170
* @param resourceGroupName The name of the resource group.
171171
* @param vmName The name of the virtual machine.

sdk/compute/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/compute/v2019_07_01/implementation/ProximityPlacementGroupImpl.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.microsoft.azure.management.compute.v2019_07_01.InstanceViewStatus;
1919

2020
class ProximityPlacementGroupImpl extends GroupableResourceCoreImpl<ProximityPlacementGroup, ProximityPlacementGroupInner, ProximityPlacementGroupImpl, ComputeManager> implements ProximityPlacementGroup, ProximityPlacementGroup.Definition, ProximityPlacementGroup.Update {
21+
private Map<String, String> utags;
2122
ProximityPlacementGroupImpl(String name, ProximityPlacementGroupInner inner, ComputeManager manager) {
2223
super(name, inner, manager);
2324
}
@@ -32,7 +33,7 @@ public Observable<ProximityPlacementGroup> createResourceAsync() {
3233
@Override
3334
public Observable<ProximityPlacementGroup> updateResourceAsync() {
3435
ProximityPlacementGroupsInner client = this.manager().inner().proximityPlacementGroups();
35-
return client.updateAsync(this.resourceGroupName(), this.name(), this.tags())
36+
return client.updateAsync(this.resourceGroupName(), this.name(), this.utags)
3637
.map(innerToFluentMap(this));
3738
}
3839

@@ -84,4 +85,11 @@ public ProximityPlacementGroupImpl withProximityPlacementGroupType(ProximityPlac
8485
this.inner().withProximityPlacementGroupType(proximityPlacementGroupType);
8586
return this;
8687
}
88+
89+
@Override
90+
public ProximityPlacementGroupImpl withTags(Map<String, String> tags) {
91+
this.utags = tags;
92+
return this;
93+
}
94+
8795
}

sdk/compute/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/compute/v2019_07_01/implementation/VirtualMachineImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public List<String> zones() {
248248
}
249249

250250
@Override
251-
public VirtualMachineImpl withExistingResourceGroup(String resourceGroupName) {
251+
public VirtualMachineImpl withExistingLocation(String resourceGroupName) {
252252
this.resourceGroupName = resourceGroupName;
253253
return this;
254254
}

sdk/compute/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/compute/v2019_07_01/implementation/VirtualMachineScaleSetVMsInner.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2537,7 +2537,7 @@ private ServiceResponse<Void> beginRedeployDelegate(Response<ResponseBody> respo
25372537
}
25382538

25392539
/**
2540-
* Performs maintenance on a virtual machine in a VM scale set.
2540+
* 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.
25412541
*
25422542
* @param resourceGroupName The name of the resource group.
25432543
* @param vmScaleSetName The name of the VM scale set.
@@ -2551,7 +2551,7 @@ public void performMaintenance(String resourceGroupName, String vmScaleSetName,
25512551
}
25522552

25532553
/**
2554-
* Performs maintenance on a virtual machine in a VM scale set.
2554+
* 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.
25552555
*
25562556
* @param resourceGroupName The name of the resource group.
25572557
* @param vmScaleSetName The name of the VM scale set.
@@ -2565,7 +2565,7 @@ public ServiceFuture<Void> performMaintenanceAsync(String resourceGroupName, Str
25652565
}
25662566

25672567
/**
2568-
* Performs maintenance on a virtual machine in a VM scale set.
2568+
* 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.
25692569
*
25702570
* @param resourceGroupName The name of the resource group.
25712571
* @param vmScaleSetName The name of the VM scale set.
@@ -2583,7 +2583,7 @@ public Void call(ServiceResponse<Void> response) {
25832583
}
25842584

25852585
/**
2586-
* Performs maintenance on a virtual machine in a VM scale set.
2586+
* 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.
25872587
*
25882588
* @param resourceGroupName The name of the resource group.
25892589
* @param vmScaleSetName The name of the VM scale set.
@@ -2610,7 +2610,7 @@ public Observable<ServiceResponse<Void>> performMaintenanceWithServiceResponseAs
26102610
}
26112611

26122612
/**
2613-
* Performs maintenance on a virtual machine in a VM scale set.
2613+
* 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.
26142614
*
26152615
* @param resourceGroupName The name of the resource group.
26162616
* @param vmScaleSetName The name of the VM scale set.
@@ -2624,7 +2624,7 @@ public void beginPerformMaintenance(String resourceGroupName, String vmScaleSetN
26242624
}
26252625

26262626
/**
2627-
* Performs maintenance on a virtual machine in a VM scale set.
2627+
* 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.
26282628
*
26292629
* @param resourceGroupName The name of the resource group.
26302630
* @param vmScaleSetName The name of the VM scale set.
@@ -2638,7 +2638,7 @@ public ServiceFuture<Void> beginPerformMaintenanceAsync(String resourceGroupName
26382638
}
26392639

26402640
/**
2641-
* Performs maintenance on a virtual machine in a VM scale set.
2641+
* 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.
26422642
*
26432643
* @param resourceGroupName The name of the resource group.
26442644
* @param vmScaleSetName The name of the VM scale set.
@@ -2656,7 +2656,7 @@ public Void call(ServiceResponse<Void> response) {
26562656
}
26572657

26582658
/**
2659-
* Performs maintenance on a virtual machine in a VM scale set.
2659+
* 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.
26602660
*
26612661
* @param resourceGroupName The name of the resource group.
26622662
* @param vmScaleSetName The name of the VM scale set.

0 commit comments

Comments
 (0)