Skip to content

[AutoPR hanaonazure/resource-manager] Update swagger spec to add existing log analytics workspace #8485

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

Closed
AutorestCI wants to merge 4 commits into from
Closed

[AutoPR hanaonazure/resource-manager] Update swagger spec to add existing log analytics workspace #8485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f677c69
Generated from cd06bf6cf760c3317308a6e6dcf5d98d09317bcf
AutorestCI Nov 7, 2019
950c1dd
Generated from 7570161a79babd37d95f29c1467239545ba00212
AutorestCI Nov 7, 2019
7284141
Generated from c6be272142e338d29ac71d3b21ee8b313f97b841
AutorestCI Nov 7, 2019
be161e3
Generated from e9c43e189627a973572bd73576f34f7ad39fb71c
AutorestCI Nov 14, 2019
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
14 changes: 9 additions & 5 deletions ...ure/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/_hana_management_client_enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ class HanaInstanceSizeNamesEnum(str, Enum):
s192m = "S192m"
s192xm = "S192xm"
s96 = "S96"
s112 = "S112"
s224m = "S224m"
s224o = "S224o"
s224om = "S224om"
s224oo = "S224oo"
s224oom = "S224oom"
s224ooo = "S224ooo"
s224oxm = "S224oxm"
s224oxxm = "S224oxxm"
s384 = "S384"
s384m = "S384m"
s384xm = "S384xm"
Expand All @@ -38,11 +47,6 @@ class HanaInstanceSizeNamesEnum(str, Enum):
s768m = "S768m"
s768xm = "S768xm"
s960m = "S960m"
s224o = "S224o"
s224m = "S224m"
s224om = "S224om"
s224oxm = "S224oxm"
s224oxxm = "S224oxxm"


class HanaInstancePowerStateEnum(str, Enum):
Expand Down
31 changes: 25 additions & 6 deletions sdk/hanaonazure/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,9 @@ class HardwareProfile(Model):
~azure.mgmt.hanaonazure.models.HanaHardwareTypeNamesEnum
:ivar hana_instance_size: Specifies the HANA instance SKU. Possible values
include: 'S72m', 'S144m', 'S72', 'S144', 'S192', 'S192m', 'S192xm', 'S96',
'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m', 'S576xm', 'S768', 'S768m',
'S768xm', 'S960m', 'S224o', 'S224m', 'S224om', 'S224oxm', 'S224oxxm'
'S112', 'S224m', 'S224o', 'S224om', 'S224oo', 'S224oom', 'S224ooo',
'S224oxm', 'S224oxxm', 'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m',
'S576xm', 'S768', 'S768m', 'S768xm', 'S960m'
:vartype hana_instance_size: str or
~azure.mgmt.hanaonazure.models.HanaInstanceSizeNamesEnum
"""
Expand Down Expand Up @@ -495,6 +496,8 @@ class SapMonitor(Resource):
:param hana_db_credentials_msi_id: MSI ID passed by customer which has
access to customer's KeyVault and to be assigned to the Collector VM.
:type hana_db_credentials_msi_id: str
:param key_vault_id: Key Vault ID containing customer's HANA credentials.
:type key_vault_id: str
:ivar provisioning_state: State of provisioning of the HanaInstance.
Possible values include: 'Accepted', 'Creating', 'Updating', 'Failed',
'Succeeded', 'Deleting', 'Migrating'
Expand All @@ -503,9 +506,18 @@ class SapMonitor(Resource):
:ivar managed_resource_group_name: The name of the resource group the SAP
Monitor resources get deployed into.
:vartype managed_resource_group_name: str
:ivar log_analytics_workspace_arm_id: The ARM ID of the Log Analytics
:param log_analytics_workspace_arm_id: The ARM ID of the Log Analytics
Workspace that is used for monitoring
:vartype log_analytics_workspace_arm_id: str
:type log_analytics_workspace_arm_id: str
:param enable_customer_analytics: The value indicating whether to send
analytics to Microsoft
:type enable_customer_analytics: bool
:param log_analytics_workspace_id: The workspace ID of the log analytics
workspace to be used for monitoring
:type log_analytics_workspace_id: str
:param log_analytics_workspace_shared_key: The shared key of the log
analytics workspace that is used for monitoring
:type log_analytics_workspace_shared_key: str
"""

_validation = {
Expand All @@ -515,7 +527,6 @@ class SapMonitor(Resource):
'tags': {'readonly': True},
'provisioning_state': {'readonly': True},
'managed_resource_group_name': {'readonly': True},
'log_analytics_workspace_arm_id': {'readonly': True},
}

_attribute_map = {
Expand All @@ -532,9 +543,13 @@ class SapMonitor(Resource):
'hana_db_password': {'key': 'properties.hanaDbPassword', 'type': 'str'},
'hana_db_password_key_vault_url': {'key': 'properties.hanaDbPasswordKeyVaultUrl', 'type': 'str'},
'hana_db_credentials_msi_id': {'key': 'properties.hanaDbCredentialsMsiId', 'type': 'str'},
'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'managed_resource_group_name': {'key': 'properties.managedResourceGroupName', 'type': 'str'},
'log_analytics_workspace_arm_id': {'key': 'properties.logAnalyticsWorkspaceArmId', 'type': 'str'},
'enable_customer_analytics': {'key': 'properties.enableCustomerAnalytics', 'type': 'bool'},
'log_analytics_workspace_id': {'key': 'properties.logAnalyticsWorkspaceId', 'type': 'str'},
'log_analytics_workspace_shared_key': {'key': 'properties.logAnalyticsWorkspaceSharedKey', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand All @@ -547,9 +562,13 @@ def __init__(self, **kwargs):
self.hana_db_password = kwargs.get('hana_db_password', None)
self.hana_db_password_key_vault_url = kwargs.get('hana_db_password_key_vault_url', None)
self.hana_db_credentials_msi_id = kwargs.get('hana_db_credentials_msi_id', None)
self.key_vault_id = kwargs.get('key_vault_id', None)
self.provisioning_state = None
self.managed_resource_group_name = None
self.log_analytics_workspace_arm_id = None
self.log_analytics_workspace_arm_id = kwargs.get('log_analytics_workspace_arm_id', None)
self.enable_customer_analytics = kwargs.get('enable_customer_analytics', None)
self.log_analytics_workspace_id = kwargs.get('log_analytics_workspace_id', None)
self.log_analytics_workspace_shared_key = kwargs.get('log_analytics_workspace_shared_key', None)


class StorageProfile(Model):
Expand Down
33 changes: 26 additions & 7 deletions sdk/hanaonazure/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,9 @@ class HardwareProfile(Model):
~azure.mgmt.hanaonazure.models.HanaHardwareTypeNamesEnum
:ivar hana_instance_size: Specifies the HANA instance SKU. Possible values
include: 'S72m', 'S144m', 'S72', 'S144', 'S192', 'S192m', 'S192xm', 'S96',
'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m', 'S576xm', 'S768', 'S768m',
'S768xm', 'S960m', 'S224o', 'S224m', 'S224om', 'S224oxm', 'S224oxxm'
'S112', 'S224m', 'S224o', 'S224om', 'S224oo', 'S224oom', 'S224ooo',
'S224oxm', 'S224oxxm', 'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m',
'S576xm', 'S768', 'S768m', 'S768xm', 'S960m'
:vartype hana_instance_size: str or
~azure.mgmt.hanaonazure.models.HanaInstanceSizeNamesEnum
"""
Expand Down Expand Up @@ -495,6 +496,8 @@ class SapMonitor(Resource):
:param hana_db_credentials_msi_id: MSI ID passed by customer which has
access to customer's KeyVault and to be assigned to the Collector VM.
:type hana_db_credentials_msi_id: str
:param key_vault_id: Key Vault ID containing customer's HANA credentials.
:type key_vault_id: str
:ivar provisioning_state: State of provisioning of the HanaInstance.
Possible values include: 'Accepted', 'Creating', 'Updating', 'Failed',
'Succeeded', 'Deleting', 'Migrating'
Expand All @@ -503,9 +506,18 @@ class SapMonitor(Resource):
:ivar managed_resource_group_name: The name of the resource group the SAP
Monitor resources get deployed into.
:vartype managed_resource_group_name: str
:ivar log_analytics_workspace_arm_id: The ARM ID of the Log Analytics
:param log_analytics_workspace_arm_id: The ARM ID of the Log Analytics
Workspace that is used for monitoring
:vartype log_analytics_workspace_arm_id: str
:type log_analytics_workspace_arm_id: str
:param enable_customer_analytics: The value indicating whether to send
analytics to Microsoft
:type enable_customer_analytics: bool
:param log_analytics_workspace_id: The workspace ID of the log analytics
workspace to be used for monitoring
:type log_analytics_workspace_id: str
:param log_analytics_workspace_shared_key: The shared key of the log
analytics workspace that is used for monitoring
:type log_analytics_workspace_shared_key: str
"""

_validation = {
Expand All @@ -515,7 +527,6 @@ class SapMonitor(Resource):
'tags': {'readonly': True},
'provisioning_state': {'readonly': True},
'managed_resource_group_name': {'readonly': True},
'log_analytics_workspace_arm_id': {'readonly': True},
}

_attribute_map = {
Expand All @@ -532,12 +543,16 @@ class SapMonitor(Resource):
'hana_db_password': {'key': 'properties.hanaDbPassword', 'type': 'str'},
'hana_db_password_key_vault_url': {'key': 'properties.hanaDbPasswordKeyVaultUrl', 'type': 'str'},
'hana_db_credentials_msi_id': {'key': 'properties.hanaDbCredentialsMsiId', 'type': 'str'},
'key_vault_id': {'key': 'properties.keyVaultId', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'managed_resource_group_name': {'key': 'properties.managedResourceGroupName', 'type': 'str'},
'log_analytics_workspace_arm_id': {'key': 'properties.logAnalyticsWorkspaceArmId', 'type': 'str'},
'enable_customer_analytics': {'key': 'properties.enableCustomerAnalytics', 'type': 'bool'},
'log_analytics_workspace_id': {'key': 'properties.logAnalyticsWorkspaceId', 'type': 'str'},
'log_analytics_workspace_shared_key': {'key': 'properties.logAnalyticsWorkspaceSharedKey', 'type': 'str'},
}

def __init__(self, *, location: str=None, hana_subnet: str=None, hana_hostname: str=None, hana_db_name: str=None, hana_db_sql_port: int=None, hana_db_username: str=None, hana_db_password: str=None, hana_db_password_key_vault_url: str=None, hana_db_credentials_msi_id: str=None, **kwargs) -> None:
def __init__(self, *, location: str=None, hana_subnet: str=None, hana_hostname: str=None, hana_db_name: str=None, hana_db_sql_port: int=None, hana_db_username: str=None, hana_db_password: str=None, hana_db_password_key_vault_url: str=None, hana_db_credentials_msi_id: str=None, key_vault_id: str=None, log_analytics_workspace_arm_id: str=None, enable_customer_analytics: bool=None, log_analytics_workspace_id: str=None, log_analytics_workspace_shared_key: str=None, **kwargs) -> None:
super(SapMonitor, self).__init__(location=location, **kwargs)
self.hana_subnet = hana_subnet
self.hana_hostname = hana_hostname
Expand All @@ -547,9 +562,13 @@ def __init__(self, *, location: str=None, hana_subnet: str=None, hana_hostname:
self.hana_db_password = hana_db_password
self.hana_db_password_key_vault_url = hana_db_password_key_vault_url
self.hana_db_credentials_msi_id = hana_db_credentials_msi_id
self.key_vault_id = key_vault_id
self.provisioning_state = None
self.managed_resource_group_name = None
self.log_analytics_workspace_arm_id = None
self.log_analytics_workspace_arm_id = log_analytics_workspace_arm_id
self.enable_customer_analytics = enable_customer_analytics
self.log_analytics_workspace_id = log_analytics_workspace_id
self.log_analytics_workspace_shared_key = log_analytics_workspace_shared_key


class StorageProfile(Model):
Expand Down