mgmt upgrade network and compute (Azure#18386)

* update network spec

* generate package-2020-07

* fix compile errors

* update changelog

* update session records

* update compute spec

* update compute spec for swagger client name changes

* regenerate code

* switch to package-2020-06-30

* regenerate code

* fix compile errors

* update session records

* update compute changelog

* update revapi for network

* update revapi for compute

* update revapi for azure-resourcemanager

* update changelog

Author: xseeseesee

sdk/resourcemanager/api-specs.json

@@ -76,7 +76,7 @@
     "dir": "azure-resourcemanager-compute",
     "source": "specification/compute/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.compute",
-    "args": "--payload-flattening-threshold=1 --tag=package-2019-12-01"
+    "args": "--payload-flattening-threshold=1 --tag=package-2020-06-30 --rename-model=UserAssignedIdentitiesValue:VirtualMachineIdentityUserAssignedIdentities,VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue:VirtualMachineScaleSetIdentityUserAssignedIdentities"
   },
   "consumption": {
     "dir": "azure-resourcemanager-consumption",
@@ -212,7 +212,7 @@
     "dir": "azure-resourcemanager-network",
     "source": "specification/network/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.network",
-    "args": "--payload-flattening-threshold=1 --tag=package-2020-05 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture"
+    "args": "--payload-flattening-threshold=1 --tag=package-2020-07 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture"
   },
   "notificationhubs": {
     "dir": "azure-resourcemanager-notificationhubs",

sdk/resourcemanager/azure-resourcemanager-compute/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 2.2.0-beta.1 (Unreleased)
 
+- Updated `api-version` to `2020-06-01`
 
 ## 2.1.0 (2020-11-24)
 

sdk/resourcemanager/azure-resourcemanager-compute/pom.xml

@@ -221,6 +221,9 @@
               <item>
                 <code>java.method.addedToInterface</code>
               </item>
+              <item>
+                <code>java.method.returnTypeChangedCovariantly</code>
+              </item>
               <item>
                 <regex>true</regex>
                 <code>.*</code>

sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/fluent/AvailabilitySetsClient.java

@@ -312,25 +312,25 @@ Response<AvailabilitySetInner> getByResourceGroupWithResponse(
     /**
      * Lists all availability sets in a subscription.
      *
-     * @param expand The expand expression to apply to the operation. Allowed values are 'instanceView'.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the List Availability Set operation response.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<AvailabilitySetInner> list(String expand, Context context);
+    PagedIterable<AvailabilitySetInner> list();
 
     /**
      * Lists all availability sets in a subscription.
      *
+     * @param expand The expand expression to apply to the operation. Allowed values are 'instanceView'.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the List Availability Set operation response.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<AvailabilitySetInner> list();
+    PagedIterable<AvailabilitySetInner> list(String expand, Context context);
 
     /**
      * Lists all availability sets in a resource group.

sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/fluent/ComputeManagementClient.java

@@ -178,6 +178,13 @@ public interface ComputeManagementClient {
      */
     VirtualMachineRunCommandsClient getVirtualMachineRunCommands();
 
+    /**
+     * Gets the VirtualMachineScaleSetVMRunCommandsClient object to access its operations.
+     *
+     * @return the VirtualMachineScaleSetVMRunCommandsClient object.
+     */
+    VirtualMachineScaleSetVMRunCommandsClient getVirtualMachineScaleSetVMRunCommands();
+
     /**
      * Gets the ResourceSkusClient object to access its operations.
      *
@@ -206,6 +213,13 @@ public interface ComputeManagementClient {
      */
     DiskEncryptionSetsClient getDiskEncryptionSets();
 
+    /**
+     * Gets the DiskAccessesClient object to access its operations.
+     *
+     * @return the DiskAccessesClient object.
+     */
+    DiskAccessesClient getDiskAccesses();
+
     /**
      * Gets the GalleriesClient object to access its operations.
      *

sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/fluent/DedicatedHostGroupsClient.java

@@ -12,6 +12,7 @@
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.compute.fluent.models.DedicatedHostGroupInner;
 import com.azure.resourcemanager.compute.models.DedicatedHostGroupUpdate;
+import com.azure.resourcemanager.compute.models.InstanceViewTypes;
 import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsDelete;
 import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsGet;
 import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsListing;
@@ -216,14 +217,32 @@ Response<DedicatedHostGroupInner> updateWithResponse(
      *
      * @param resourceGroupName The name of the resource group.
      * @param hostGroupName The name of the dedicated host group.
+     * @param expand The expand expression to apply on the operation. The response shows the list of instance view of
+     *     the dedicated hosts under the dedicated host group.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return specifies information about the dedicated host group that the dedicated hosts should be assigned to.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Mono<Response<DedicatedHostGroupInner>> getByResourceGroupWithResponseAsync(
-        String resourceGroupName, String hostGroupName);
+        String resourceGroupName, String hostGroupName, InstanceViewTypes expand);
+
+    /**
+     * Retrieves information about a dedicated host group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param hostGroupName The name of the dedicated host group.
+     * @param expand The expand expression to apply on the operation. The response shows the list of instance view of
+     *     the dedicated hosts under the dedicated host group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return specifies information about the dedicated host group that the dedicated hosts should be assigned to.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<DedicatedHostGroupInner> getByResourceGroupAsync(
+        String resourceGroupName, String hostGroupName, InstanceViewTypes expand);
 
     /**
      * Retrieves information about a dedicated host group.
@@ -256,6 +275,8 @@ Mono<Response<DedicatedHostGroupInner>> getByResourceGroupWithResponseAsync(
      *
      * @param resourceGroupName The name of the resource group.
      * @param hostGroupName The name of the dedicated host group.
+     * @param expand The expand expression to apply on the operation. The response shows the list of instance view of
+     *     the dedicated hosts under the dedicated host group.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
@@ -264,7 +285,7 @@ Mono<Response<DedicatedHostGroupInner>> getByResourceGroupWithResponseAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<DedicatedHostGroupInner> getByResourceGroupWithResponse(
-        String resourceGroupName, String hostGroupName, Context context);
+        String resourceGroupName, String hostGroupName, InstanceViewTypes expand, Context context);
 
     /**
      * Lists all of the dedicated host groups in the specified resource group. Use the nextLink property in the response