Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AutoPR billing/resource-manager] [Billing RP] Minor EnrollmentAccount API consistency tweaks #2221

Merged
merged 1 commit into from
Mar 20, 2018
Merged

[AutoPR billing/resource-manager] [Billing RP] Minor EnrollmentAccount API consistency tweaks #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure-mgmt-billing/azure/mgmt/billing/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .enrollment_account_result import EnrollmentAccountResult
from .enrollment_account import EnrollmentAccount
from .enrollment_account_list_result import EnrollmentAccountListResult
from .billing_period import BillingPeriod
from .download_url import DownloadUrl
Expand All @@ -24,7 +24,7 @@
from .operation_paged import OperationPaged

__all__ = [
'EnrollmentAccountResult',
'EnrollmentAccount',
'EnrollmentAccountListResult',
'BillingPeriod',
'DownloadUrl',
Expand Down
4 changes: 2 additions & 2 deletions ...lling/models/enrollment_account_result.py → ...mgmt/billing/models/enrollment_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from .resource import Resource


class EnrollmentAccountResult(Resource):
class EnrollmentAccount(Resource):
"""An enrollment account resource.

Variables are only populated by the server, and will be ignored when
Expand Down Expand Up @@ -43,5 +43,5 @@ class EnrollmentAccountResult(Resource):
}

def __init__(self):
super(EnrollmentAccountResult, self).__init__()
super(EnrollmentAccount, self).__init__()
self.principal_name = None
9 changes: 7 additions & 2 deletions azure-mgmt-billing/azure/mgmt/billing/models/enrollment_account_list_result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,22 @@ class EnrollmentAccountListResult(Model):
sending a request.

:ivar value: The list of enrollment accounts.
:vartype value: list[~azure.mgmt.billing.models.EnrollmentAccountResult]
:vartype value: list[~azure.mgmt.billing.models.EnrollmentAccount]
:ivar next_link: The link (url) to the next page of results.
:vartype next_link: str
"""

_validation = {
'value': {'readonly': True},
'next_link': {'readonly': True},
}

_attribute_map = {
'value': {'key': 'value', 'type': '[EnrollmentAccountResult]'},
'value': {'key': 'value', 'type': '[EnrollmentAccount]'},
'next_link': {'key': 'nextLink', 'type': 'str'},
}

def __init__(self):
super(EnrollmentAccountListResult, self).__init__()
self.value = None
self.next_link = None
6 changes: 3 additions & 3 deletions azure-mgmt-billing/azure/mgmt/billing/operations/enrollment_accounts_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ def get(
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:return: EnrollmentAccountResult or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.billing.models.EnrollmentAccountResult or
:return: EnrollmentAccount or ClientRawResponse if raw=true
:rtype: ~azure.mgmt.billing.models.EnrollmentAccount or
~msrest.pipeline.ClientRawResponse
:raises:
:class:`ErrorResponseException<azure.mgmt.billing.models.ErrorResponseException>`
Expand Down Expand Up @@ -135,7 +135,7 @@ def get(
deserialized = None

if response.status_code == 200:
deserialized = self._deserialize('EnrollmentAccountResult', response)
deserialized = self._deserialize('EnrollmentAccount', response)

if raw:
client_raw_response = ClientRawResponse(deserialized, response)
Expand Down