mgmt, aks, correct model name (Azure#27419)

Author: weidongxu-microsoft

sdk/resourcemanager/api-specs.json

@@ -126,7 +126,7 @@
     "dir": "azure-resourcemanager-containerservice",
     "source": "specification/containerservice/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.containerservice",
-    "args": "--tag=package-2022-01 --preserve-model=ContainerServiceVMSizeTypes"
+    "args": "--tag=package-2022-01 --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku"
   },
   "containerservice-hybrid": {
     "dir": "../resourcemanagerhybrid/azure-resourcemanager-containerservice",

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

@@ -5,15 +5,11 @@
 package com.azure.resourcemanager.compute.fluent.models;
 
 import com.azure.core.annotation.Immutable;
-import com.azure.core.util.logging.ClientLogger;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /** A disk access SAS uri. */
 @Immutable
 public final class AccessUriInner {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(AccessUriInner.class);
-
     /*
      * A SAS uri for accessing a disk.
      */

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

@@ -7,10 +7,8 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.Resource;
 import com.azure.core.management.SubResource;
-import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.compute.models.InstanceViewStatus;
 import com.azure.resourcemanager.compute.models.Sku;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 import java.util.Map;
@@ -26,8 +24,6 @@
  */
 @Fluent
 public final class AvailabilitySetInner extends Resource {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilitySetInner.class);
-
     /*
      * The instance view of a resource.
      */

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

@@ -6,17 +6,13 @@
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.SubResource;
-import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.compute.models.InstanceViewStatus;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
 /** The instance view of a resource. */
 @Fluent
 public final class AvailabilitySetProperties {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(AvailabilitySetProperties.class);
-
     /*
      * Update Domain count.
      */

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

@@ -6,10 +6,8 @@
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.Resource;
-import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.compute.models.CapacityReservationGroupInstanceView;
 import com.azure.resourcemanager.compute.models.SubResourceReadOnly;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 import java.util.Map;
@@ -21,8 +19,6 @@
  */
 @Fluent
 public final class CapacityReservationGroupInner extends Resource {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(CapacityReservationGroupInner.class);
-
     /*
      * capacity reservation group Properties.
      */

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

@@ -5,18 +5,14 @@
 package com.azure.resourcemanager.compute.fluent.models;
 
 import com.azure.core.annotation.Immutable;
-import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.compute.models.CapacityReservationGroupInstanceView;
 import com.azure.resourcemanager.compute.models.SubResourceReadOnly;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
 /** capacity reservation group Properties. */
 @Immutable
 public final class CapacityReservationGroupProperties {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(CapacityReservationGroupProperties.class);
-
     /*
      * A list of all capacity reservation resource ids that belong to capacity
      * reservation group.

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

@@ -10,7 +10,6 @@
 import com.azure.resourcemanager.compute.models.CapacityReservationInstanceView;
 import com.azure.resourcemanager.compute.models.Sku;
 import com.azure.resourcemanager.compute.models.SubResourceReadOnly;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.OffsetDateTime;
 import java.util.List;
@@ -19,8 +18,6 @@
 /** Specifies information about the capacity reservation. */
 @Fluent
 public final class CapacityReservationInner extends Resource {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(CapacityReservationInner.class);
-
     /*
      * Properties of the Capacity reservation.
      */
@@ -191,11 +188,13 @@ public void validate() {
             innerProperties().validate();
         }
         if (sku() == null) {
-            throw logger
+            throw LOGGER
                 .logExceptionAsError(
                     new IllegalArgumentException("Missing required property sku in model CapacityReservationInner"));
         } else {
             sku().validate();
         }
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(CapacityReservationInner.class);
 }

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

@@ -5,19 +5,15 @@
 package com.azure.resourcemanager.compute.fluent.models;
 
 import com.azure.core.annotation.Immutable;
-import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.compute.models.CapacityReservationInstanceView;
 import com.azure.resourcemanager.compute.models.SubResourceReadOnly;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.OffsetDateTime;
 import java.util.List;
 
 /** Properties of the Capacity reservation. */
 @Immutable
 public final class CapacityReservationProperties {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(CapacityReservationProperties.class);
-
     /*
      * A unique id generated and assigned to the capacity reservation by the
      * platform which does not change throughout the lifetime of the resource.

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

@@ -6,17 +6,13 @@
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.Resource;
-import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.compute.models.CloudServiceProperties;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
 /** Describes the cloud service. */
 @Fluent
 public final class CloudServiceInner extends Resource {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(CloudServiceInner.class);
-
     /*
      * Cloud service properties
      */

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

@@ -5,18 +5,14 @@
 package com.azure.resourcemanager.compute.fluent.models;
 
 import com.azure.core.annotation.Fluent;
-import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.compute.models.InstanceViewStatusesSummary;
 import com.azure.resourcemanager.compute.models.ResourceInstanceViewStatus;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
 /** InstanceView of CloudService as a whole. */
 @Fluent
 public final class CloudServiceInstanceViewInner {
-    @JsonIgnore private final ClientLogger logger = new ClientLogger(CloudServiceInstanceViewInner.class);
-
     /*
      * Instance view statuses.
      */