[AutoPR azure-mgmt-billing] Swagger fixes for CLI and powershell

sdk/billing/azure-mgmt-billing/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "e79d9ef3e065f2dcb6bd1db51e29c62a99dff5cb",
+  "commit": "6a3a5dcf7d798b30084455dd380d9150bf679b52",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.10.2",
   "use": [
     "@autorest/[email protected]",
     "@autorest/[email protected]"
   ],
-  "autorest_command": "autorest specification/billing/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/billing/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
   "readme": "specification/billing/resource-manager/readme.md"
 }

sdk/billing/azure-mgmt-billing/azure/mgmt/billing/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "7.0.0"
+VERSION = "0.3.0"

sdk/billing/azure-mgmt-billing/azure/mgmt/billing/models/__init__.py

@@ -117,7 +117,6 @@
 from ._models_py3 import InvoicePropertiesBilledAmount
 from ._models_py3 import InvoicePropertiesCreditAmount
 from ._models_py3 import InvoicePropertiesFreeAzureCreditApplied
-from ._models_py3 import InvoicePropertiesRebillDetails
 from ._models_py3 import InvoicePropertiesRefundDetails
 from ._models_py3 import InvoicePropertiesSubTotal
 from ._models_py3 import InvoicePropertiesTaxAmount
@@ -445,7 +444,6 @@
     "InvoicePropertiesBilledAmount",
     "InvoicePropertiesCreditAmount",
     "InvoicePropertiesFreeAzureCreditApplied",
-    "InvoicePropertiesRebillDetails",
     "InvoicePropertiesRefundDetails",
     "InvoicePropertiesSubTotal",
     "InvoicePropertiesTaxAmount",

sdk/billing/azure-mgmt-billing/azure/mgmt/billing/models/_models_py3.py

@@ -5189,7 +5189,7 @@ class BillingSubscriptionListResult(_serialization.Model):
     :ivar next_link: The link (url) to the next page of results.
     :vartype next_link: str
     :ivar total_count: Total number of records.
-    :vartype total_count: int
+    :vartype total_count: float
     :ivar value: The list of resources.
     :vartype value: list[~azure.mgmt.billing.models.BillingSubscription]
     """
@@ -5202,7 +5202,7 @@ class BillingSubscriptionListResult(_serialization.Model):
 
     _attribute_map = {
         "next_link": {"key": "nextLink", "type": "str"},
-        "total_count": {"key": "totalCount", "type": "int"},
+        "total_count": {"key": "totalCount", "type": "float"},
         "value": {"key": "value", "type": "[BillingSubscription]"},
     }
 
@@ -7140,7 +7140,7 @@ class InvoiceProperties(_serialization.Model):  # pylint: disable=too-many-insta
     :ivar purchase_order_number: An optional purchase order number for the invoice.
     :vartype purchase_order_number: str
     :ivar rebill_details: Rebill details for an invoice.
-    :vartype rebill_details: ~azure.mgmt.billing.models.InvoicePropertiesRebillDetails
+    :vartype rebill_details: ~azure.mgmt.billing.models.RebillDetails
     :ivar status: The current status of the invoice. Known values are: "Other", "Due", "OverDue",
      "Paid", "Void", and "Locked".
     :vartype status: str or ~azure.mgmt.billing.models.InvoiceStatus
@@ -7182,6 +7182,7 @@ class InvoiceProperties(_serialization.Model):  # pylint: disable=too-many-insta
         "is_monthly_invoice": {"readonly": True},
         "payments": {"readonly": True},
         "purchase_order_number": {"readonly": True},
+        "rebill_details": {"readonly": True},
         "status": {"readonly": True},
         "subscription_display_name": {"readonly": True},
         "subscription_id": {"readonly": True},
@@ -7215,7 +7216,7 @@ class InvoiceProperties(_serialization.Model):  # pylint: disable=too-many-insta
         "is_monthly_invoice": {"key": "isMonthlyInvoice", "type": "bool"},
         "payments": {"key": "payments", "type": "[Payment]"},
         "purchase_order_number": {"key": "purchaseOrderNumber", "type": "str"},
-        "rebill_details": {"key": "rebillDetails", "type": "InvoicePropertiesRebillDetails"},
+        "rebill_details": {"key": "rebillDetails", "type": "RebillDetails"},
         "status": {"key": "status", "type": "str"},
         "subscription_display_name": {"key": "subscriptionDisplayName", "type": "str"},
         "subscription_id": {"key": "subscriptionId", "type": "str"},
@@ -7234,7 +7235,6 @@ def __init__(  # pylint: disable=too-many-locals
         billed_amount: Optional["_models.InvoicePropertiesBilledAmount"] = None,
         credit_amount: Optional["_models.InvoicePropertiesCreditAmount"] = None,
         free_azure_credit_applied: Optional["_models.InvoicePropertiesFreeAzureCreditApplied"] = None,
-        rebill_details: Optional["_models.InvoicePropertiesRebillDetails"] = None,
         sub_total: Optional["_models.InvoicePropertiesSubTotal"] = None,
         tax_amount: Optional["_models.InvoicePropertiesTaxAmount"] = None,
         total_amount: Optional["_models.InvoicePropertiesTotalAmount"] = None,
@@ -7258,8 +7258,6 @@ def __init__(  # pylint: disable=too-many-locals
          This field is applicable to billing accounts with agreement type Microsoft Customer Agreement.
         :paramtype free_azure_credit_applied:
          ~azure.mgmt.billing.models.InvoicePropertiesFreeAzureCreditApplied
-        :keyword rebill_details: Rebill details for an invoice.
-        :paramtype rebill_details: ~azure.mgmt.billing.models.InvoicePropertiesRebillDetails
         :keyword sub_total: The pre-tax amount due. This field is applicable to billing accounts with
          agreement type Microsoft Customer Agreement.
         :paramtype sub_total: ~azure.mgmt.billing.models.InvoicePropertiesSubTotal
@@ -7293,7 +7291,7 @@ def __init__(  # pylint: disable=too-many-locals
         self.is_monthly_invoice = None
         self.payments = None
         self.purchase_order_number = None
-        self.rebill_details = rebill_details
+        self.rebill_details = None
         self.status = None
         self.subscription_display_name = None
         self.subscription_id = None
@@ -7372,53 +7370,6 @@ class InvoicePropertiesFreeAzureCreditApplied(Amount):
     """
 
 
-class RebillDetails(_serialization.Model):
-    """The rebill details of an invoice.
-
-    Variables are only populated by the server, and will be ignored when sending a request.
-
-    :ivar invoice_document_id: The ID of invoice.
-    :vartype invoice_document_id: str
-    :ivar credit_note_document_id: The ID of credit note.
-    :vartype credit_note_document_id: str
-    :ivar rebill_details: The rebill details of an invoice.
-    :vartype rebill_details: ~azure.mgmt.billing.models.RebillDetails
-    """
-
-    _validation = {
-        "invoice_document_id": {"readonly": True},
-        "credit_note_document_id": {"readonly": True},
-        "rebill_details": {"readonly": True},
-    }
-
-    _attribute_map = {
-        "invoice_document_id": {"key": "invoiceDocumentId", "type": "str"},
-        "credit_note_document_id": {"key": "creditNoteDocumentId", "type": "str"},
-        "rebill_details": {"key": "rebillDetails", "type": "RebillDetails"},
-    }
-
-    def __init__(self, **kwargs: Any) -> None:
-        """ """
-        super().__init__(**kwargs)
-        self.invoice_document_id = None
-        self.credit_note_document_id = None
-        self.rebill_details = None
-
-
-class InvoicePropertiesRebillDetails(RebillDetails):
-    """Rebill details for an invoice.
-
-    Variables are only populated by the server, and will be ignored when sending a request.
-
-    :ivar invoice_document_id: The ID of invoice.
-    :vartype invoice_document_id: str
-    :ivar credit_note_document_id: The ID of credit note.
-    :vartype credit_note_document_id: str
-    :ivar rebill_details: The rebill details of an invoice.
-    :vartype rebill_details: ~azure.mgmt.billing.models.RebillDetails
-    """
-
-
 class RefundDetailsSummary(_serialization.Model):
     """The details of refund request.
 
@@ -9679,6 +9630,39 @@ def __init__(
         self.applied_scope_properties = applied_scope_properties
 
 
+class RebillDetails(_serialization.Model):
+    """The rebill details of an invoice.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar invoice_document_id: The ID of invoice.
+    :vartype invoice_document_id: str
+    :ivar credit_note_document_id: The ID of credit note.
+    :vartype credit_note_document_id: str
+    :ivar rebill_details: The rebill details of an invoice.
+    :vartype rebill_details: ~azure.mgmt.billing.models.RebillDetails
+    """
+
+    _validation = {
+        "invoice_document_id": {"readonly": True},
+        "credit_note_document_id": {"readonly": True},
+        "rebill_details": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "invoice_document_id": {"key": "invoiceDocumentId", "type": "str"},
+        "credit_note_document_id": {"key": "creditNoteDocumentId", "type": "str"},
+        "rebill_details": {"key": "rebillDetails", "type": "RebillDetails"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.invoice_document_id = None
+        self.credit_note_document_id = None
+        self.rebill_details = None
+
+
 class RecipientTransferDetails(ProxyResourceWithTags):  # pylint: disable=too-many-instance-attributes
     """Details of the transfer.
 
@@ -10901,19 +10885,13 @@ class ReservationPurchaseRequest(_serialization.Model):  # pylint: disable=too-m
     :ivar renew: Setting this to true will automatically purchase a new benefit on the expiration
      date time.
     :vartype renew: bool
-    :ivar instance_flexibility_properties_instance_flexibility: Allows reservation discount to be
-     applied across skus within the same auto fit group. Not all skus support instance size
-     flexibility. Known values are: "On" and "Off".
-    :vartype instance_flexibility_properties_instance_flexibility: str or
-     ~azure.mgmt.billing.models.InstanceFlexibility
     :ivar review_date_time: This is the date-time when the Azure hybrid benefit needs to be
      reviewed.
     :vartype review_date_time: ~datetime.datetime
-    :ivar instance_flexibility_properties_reserved_resource_properties_instance_flexibility:
-     Turning this on will apply the reservation discount to other VMs in the same VM size group.
-     Only specify for VirtualMachines reserved resource type. Known values are: "On" and "Off".
-    :vartype instance_flexibility_properties_reserved_resource_properties_instance_flexibility: str
-     or ~azure.mgmt.billing.models.InstanceFlexibility
+    :ivar instance_flexibility: Turning this on will apply the reservation discount to other VMs in
+     the same VM size group. Only specify for VirtualMachines reserved resource type. Known values
+     are: "On" and "Off".
+    :vartype instance_flexibility: str or ~azure.mgmt.billing.models.InstanceFlexibility
     """
 
     _validation = {
@@ -10938,15 +10916,8 @@ class ReservationPurchaseRequest(_serialization.Model):  # pylint: disable=too-m
             "type": "ReservationAppliedScopeProperties",
         },
         "renew": {"key": "properties.renew", "type": "bool"},
-        "instance_flexibility_properties_instance_flexibility": {
-            "key": "properties.instanceFlexibility",
-            "type": "str",
-        },
         "review_date_time": {"key": "properties.reviewDateTime", "type": "iso-8601"},
-        "instance_flexibility_properties_reserved_resource_properties_instance_flexibility": {
-            "key": "properties.reservedResourceProperties.instanceFlexibility",
-            "type": "str",
-        },
+        "instance_flexibility": {"key": "properties.reservedResourceProperties.instanceFlexibility", "type": "str"},
     }
 
     def __init__(
@@ -10961,13 +10932,8 @@ def __init__(
         applied_scopes: Optional[List[str]] = None,
         applied_scope_properties: Optional["_models.ReservationAppliedScopeProperties"] = None,
         renew: bool = False,
-        instance_flexibility_properties_instance_flexibility: Optional[
-            Union[str, "_models.InstanceFlexibility"]
-        ] = None,
         review_date_time: Optional[datetime.datetime] = None,
-        instance_flexibility_properties_reserved_resource_properties_instance_flexibility: Optional[
-            Union[str, "_models.InstanceFlexibility"]
-        ] = None,
+        instance_flexibility: Optional[Union[str, "_models.InstanceFlexibility"]] = None,
         **kwargs: Any
     ) -> None:
         """
@@ -10996,19 +10962,13 @@ def __init__(
         :keyword renew: Setting this to true will automatically purchase a new benefit on the
          expiration date time.
         :paramtype renew: bool
-        :keyword instance_flexibility_properties_instance_flexibility: Allows reservation discount to
-         be applied across skus within the same auto fit group. Not all skus support instance size
-         flexibility. Known values are: "On" and "Off".
-        :paramtype instance_flexibility_properties_instance_flexibility: str or
-         ~azure.mgmt.billing.models.InstanceFlexibility
         :keyword review_date_time: This is the date-time when the Azure hybrid benefit needs to be
          reviewed.
         :paramtype review_date_time: ~datetime.datetime
-        :keyword instance_flexibility_properties_reserved_resource_properties_instance_flexibility:
-         Turning this on will apply the reservation discount to other VMs in the same VM size group.
-         Only specify for VirtualMachines reserved resource type. Known values are: "On" and "Off".
-        :paramtype instance_flexibility_properties_reserved_resource_properties_instance_flexibility:
-         str or ~azure.mgmt.billing.models.InstanceFlexibility
+        :keyword instance_flexibility: Turning this on will apply the reservation discount to other VMs
+         in the same VM size group. Only specify for VirtualMachines reserved resource type. Known
+         values are: "On" and "Off".
+        :paramtype instance_flexibility: str or ~azure.mgmt.billing.models.InstanceFlexibility
         """
         super().__init__(**kwargs)
         self.sku = sku
@@ -11023,11 +10983,8 @@ def __init__(
         self.applied_scopes = applied_scopes
         self.applied_scope_properties = applied_scope_properties
         self.renew = renew
-        self.instance_flexibility_properties_instance_flexibility = instance_flexibility_properties_instance_flexibility
         self.review_date_time = review_date_time
-        self.instance_flexibility_properties_reserved_resource_properties_instance_flexibility = (
-            instance_flexibility_properties_reserved_resource_properties_instance_flexibility
-        )
+        self.instance_flexibility = instance_flexibility
 
 
 class ReservationSkuProperty(_serialization.Model):
@@ -12455,7 +12412,7 @@ class TransactionProperties(_serialization.Model):  # pylint: disable=too-many-i
     :ivar billing_currency: The ISO 4217 code for the currency in which this transaction is billed.
     :vartype billing_currency: str
     :ivar billing_profile_display_name: The name of the billing profile.
-    :vartype billing_profile_display_name: any
+    :vartype billing_profile_display_name: str
     :ivar billing_profile_id: The fully qualified ID that uniquely identifies a billing profile.
     :vartype billing_profile_id: str
     :ivar consumption_commitment_decremented: The amount of Microsoft Azure Consumption
@@ -12547,7 +12504,7 @@ class TransactionProperties(_serialization.Model):  # pylint: disable=too-many-i
         "azure_credit_applied": {"key": "azureCreditApplied", "type": "TransactionPropertiesAzureCreditApplied"},
         "azure_plan": {"key": "azurePlan", "type": "str"},
         "billing_currency": {"key": "billingCurrency", "type": "str"},
-        "billing_profile_display_name": {"key": "billingProfileDisplayName", "type": "object"},
+        "billing_profile_display_name": {"key": "billingProfileDisplayName", "type": "str"},
         "billing_profile_id": {"key": "billingProfileId", "type": "str"},
         "consumption_commitment_decremented": {
             "key": "consumptionCommitmentDecremented",
@@ -12597,7 +12554,7 @@ def __init__(  # pylint: disable=too-many-locals
         azure_credit_applied: Optional["_models.TransactionPropertiesAzureCreditApplied"] = None,
         azure_plan: Optional[str] = None,
         billing_currency: Optional[str] = None,
-        billing_profile_display_name: Optional[Any] = None,
+        billing_profile_display_name: Optional[str] = None,
         billing_profile_id: Optional[str] = None,
         consumption_commitment_decremented: Optional[
             "_models.TransactionPropertiesConsumptionCommitmentDecremented"
@@ -12648,7 +12605,7 @@ def __init__(  # pylint: disable=too-many-locals
          billed.
         :paramtype billing_currency: str
         :keyword billing_profile_display_name: The name of the billing profile.
-        :paramtype billing_profile_display_name: any
+        :paramtype billing_profile_display_name: str
         :keyword billing_profile_id: The fully qualified ID that uniquely identifies a billing profile.
         :paramtype billing_profile_id: str
         :keyword consumption_commitment_decremented: The amount of Microsoft Azure Consumption

sdk/billing/azure-mgmt-billing/azure/mgmt/billing/operations/_available_balances_operations.py

@@ -90,7 +90,7 @@ def build_get_by_billing_profile_request(
             pattern=r"^([0-9]+|([Pp][Cc][Nn]\.[A-Za-z0-9]+)|[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}(:[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}_[0-9]{4}(-[0-9]{2}){2})?)$",
         ),
         "billingProfileName": _SERIALIZER.url(
-            "billing_profile_name", billing_profile_name, "str", pattern=r"^[a-zA-Z\d-_]{1,128}$"
+            "billing_profile_name", billing_profile_name, "str", pattern=r"^[a-zA-Z0-9-_]{1,128}$"
         ),
     }