Skip to content

Commit 95220b7

Browse files
AutorestCIZim Kalinowski
AutorestCI
authored and
Zim Kalinowski
committed
[AutoPR hanaonazure/resource-manager] Removing monitoring hana instance API (Azure#6535)
* Generated from 70b51057c4cca0cdb6a743b4e02f39c132121570 Removing monitoring hana instance API * Generated from a6757c439ed37f69147b6a7b50a20f1ca69789be Removing monitoring hana instance API * Packaging update of azure-mgmt-hanaonazure * Updated Release History
1 parent e833df0 commit 95220b7

File tree

7 files changed

+35
-93
lines changed

7 files changed

+35
-93
lines changed

‎sdk/hanaonazure/azure-mgmt-hanaonazure/HISTORY.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
Release History
44
===============
55

6+
0.9.0 (2019-07-31)
7+
++++++++++++++++++
8+
9+
**Features**
10+
11+
- Model SapMonitor has a new parameter hana_db_credentials_msi_id
12+
- Model SapMonitor has a new parameter hana_db_password_key_vault_url
13+
14+
**Breaking changes**
15+
16+
- Removed operation HanaInstancesOperations.enable_monitoring
17+
618
0.8.0 (2019-06-26)
719
++++++++++++++++++
820

‎sdk/hanaonazure/azure-mgmt-hanaonazure/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is the Microsoft Azure SAP Hana on Azure Management Client Library.
66
Azure Resource Manager (ARM) is the next generation of management APIs that
77
replace the old Azure Service Management (ASM).
88

9-
This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
9+
This package has been tested with Python 2.7, 3.5, 3.6 and 3.7.
1010

1111
For the older Azure Service Management (ASM) libraries, see
1212
`azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.

‎sdk/hanaonazure/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/_models.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,12 @@ class SapMonitor(Resource):
489489
:type hana_db_username: str
490490
:param hana_db_password: Database password of the HANA instance.
491491
:type hana_db_password: str
492+
:param hana_db_password_key_vault_url: KeyVault URL link to the password
493+
for the HANA database.
494+
:type hana_db_password_key_vault_url: str
495+
:param hana_db_credentials_msi_id: MSI ID passed by customer which has
496+
access to customer's KeyVault and to be assigned to the Collector VM.
497+
:type hana_db_credentials_msi_id: str
492498
:ivar provisioning_state: State of provisioning of the HanaInstance.
493499
Possible values include: 'Accepted', 'Creating', 'Updating', 'Failed',
494500
'Succeeded', 'Deleting', 'Migrating'
@@ -516,6 +522,8 @@ class SapMonitor(Resource):
516522
'hana_db_sql_port': {'key': 'properties.hanaDbSqlPort', 'type': 'int'},
517523
'hana_db_username': {'key': 'properties.hanaDbUsername', 'type': 'str'},
518524
'hana_db_password': {'key': 'properties.hanaDbPassword', 'type': 'str'},
525+
'hana_db_password_key_vault_url': {'key': 'properties.hanaDbPasswordKeyVaultUrl', 'type': 'str'},
526+
'hana_db_credentials_msi_id': {'key': 'properties.hanaDbCredentialsMsiId', 'type': 'str'},
519527
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
520528
}
521529

@@ -527,6 +535,8 @@ def __init__(self, **kwargs):
527535
self.hana_db_sql_port = kwargs.get('hana_db_sql_port', None)
528536
self.hana_db_username = kwargs.get('hana_db_username', None)
529537
self.hana_db_password = kwargs.get('hana_db_password', None)
538+
self.hana_db_password_key_vault_url = kwargs.get('hana_db_password_key_vault_url', None)
539+
self.hana_db_credentials_msi_id = kwargs.get('hana_db_credentials_msi_id', None)
530540
self.provisioning_state = None
531541

532542

‎sdk/hanaonazure/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/_models_py3.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,12 @@ class SapMonitor(Resource):
489489
:type hana_db_username: str
490490
:param hana_db_password: Database password of the HANA instance.
491491
:type hana_db_password: str
492+
:param hana_db_password_key_vault_url: KeyVault URL link to the password
493+
for the HANA database.
494+
:type hana_db_password_key_vault_url: str
495+
:param hana_db_credentials_msi_id: MSI ID passed by customer which has
496+
access to customer's KeyVault and to be assigned to the Collector VM.
497+
:type hana_db_credentials_msi_id: str
492498
:ivar provisioning_state: State of provisioning of the HanaInstance.
493499
Possible values include: 'Accepted', 'Creating', 'Updating', 'Failed',
494500
'Succeeded', 'Deleting', 'Migrating'
@@ -516,17 +522,21 @@ class SapMonitor(Resource):
516522
'hana_db_sql_port': {'key': 'properties.hanaDbSqlPort', 'type': 'int'},
517523
'hana_db_username': {'key': 'properties.hanaDbUsername', 'type': 'str'},
518524
'hana_db_password': {'key': 'properties.hanaDbPassword', 'type': 'str'},
525+
'hana_db_password_key_vault_url': {'key': 'properties.hanaDbPasswordKeyVaultUrl', 'type': 'str'},
526+
'hana_db_credentials_msi_id': {'key': 'properties.hanaDbCredentialsMsiId', 'type': 'str'},
519527
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
520528
}
521529

522-
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, **kwargs) -> None:
530+
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:
523531
super(SapMonitor, self).__init__(location=location, **kwargs)
524532
self.hana_subnet = hana_subnet
525533
self.hana_hostname = hana_hostname
526534
self.hana_db_name = hana_db_name
527535
self.hana_db_sql_port = hana_db_sql_port
528536
self.hana_db_username = hana_db_username
529537
self.hana_db_password = hana_db_password
538+
self.hana_db_password_key_vault_url = hana_db_password_key_vault_url
539+
self.hana_db_credentials_msi_id = hana_db_credentials_msi_id
530540
self.provisioning_state = None
531541

532542

‎sdk/hanaonazure/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/_hana_instances_operations.py

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import uuid
1313
from msrest.pipeline import ClientRawResponse
14-
from msrestazure.azure_exceptions import CloudError
1514
from msrest.polling import LROPoller, NoPolling
1615
from msrestazure.polling.arm_polling import ARMPolling
1716

@@ -737,91 +736,3 @@ def get_long_running_output(response):
737736
else: polling_method = polling
738737
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
739738
shutdown.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/hanaInstances/{hanaInstanceName}/shutdown'}
740-
741-
742-
def _enable_monitoring_initial(
743-
self, resource_group_name, hana_instance_name, monitoring_parameter, custom_headers=None, raw=False, **operation_config):
744-
# Construct URL
745-
url = self.enable_monitoring.metadata['url']
746-
path_format_arguments = {
747-
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
748-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
749-
'hanaInstanceName': self._serialize.url("hana_instance_name", hana_instance_name, 'str')
750-
}
751-
url = self._client.format_url(url, **path_format_arguments)
752-
753-
# Construct parameters
754-
query_parameters = {}
755-
query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
756-
757-
# Construct headers
758-
header_parameters = {}
759-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
760-
if self.config.generate_client_request_id:
761-
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
762-
if custom_headers:
763-
header_parameters.update(custom_headers)
764-
if self.config.accept_language is not None:
765-
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
766-
767-
# Construct body
768-
body_content = self._serialize.body(monitoring_parameter, 'MonitoringDetails')
769-
770-
# Construct and send request
771-
request = self._client.post(url, query_parameters, header_parameters, body_content)
772-
response = self._client.send(request, stream=False, **operation_config)
773-
774-
if response.status_code not in [200, 202]:
775-
exp = CloudError(response)
776-
exp.request_id = response.headers.get('x-ms-request-id')
777-
raise exp
778-
779-
if raw:
780-
client_raw_response = ClientRawResponse(None, response)
781-
return client_raw_response
782-
783-
def enable_monitoring(
784-
self, resource_group_name, hana_instance_name, monitoring_parameter, custom_headers=None, raw=False, polling=True, **operation_config):
785-
"""The operation to add a monitor to an SAP HANA instance.
786-
787-
:param resource_group_name: Name of the resource group.
788-
:type resource_group_name: str
789-
:param hana_instance_name: Name of the SAP HANA on Azure instance.
790-
:type hana_instance_name: str
791-
:param monitoring_parameter: Request body that only contains
792-
monitoring attributes
793-
:type monitoring_parameter:
794-
~azure.mgmt.hanaonazure.models.MonitoringDetails
795-
:param dict custom_headers: headers that will be added to the request
796-
:param bool raw: The poller return type is ClientRawResponse, the
797-
direct response alongside the deserialized response
798-
:param polling: True for ARMPolling, False for no polling, or a
799-
polling object for personal polling strategy
800-
:return: An instance of LROPoller that returns None or
801-
ClientRawResponse<None> if raw==True
802-
:rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
803-
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]]
804-
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
805-
"""
806-
raw_result = self._enable_monitoring_initial(
807-
resource_group_name=resource_group_name,
808-
hana_instance_name=hana_instance_name,
809-
monitoring_parameter=monitoring_parameter,
810-
custom_headers=custom_headers,
811-
raw=True,
812-
**operation_config
813-
)
814-
815-
def get_long_running_output(response):
816-
if raw:
817-
client_raw_response = ClientRawResponse(None, response)
818-
return client_raw_response
819-
820-
lro_delay = operation_config.get(
821-
'long_running_operation_timeout',
822-
self.config.long_running_operation_timeout)
823-
if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
824-
elif polling is False: polling_method = NoPolling()
825-
else: polling_method = polling
826-
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
827-
enable_monitoring.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/hanaInstances/{hanaInstanceName}/monitoring'}

‎sdk/hanaonazure/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
VERSION = "0.8.0"
12+
VERSION = "0.9.0"
1313

‎sdk/hanaonazure/azure-mgmt-hanaonazure/setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
'Programming Language :: Python :: 2',
6565
'Programming Language :: Python :: 2.7',
6666
'Programming Language :: Python :: 3',
67-
'Programming Language :: Python :: 3.4',
6867
'Programming Language :: Python :: 3.5',
6968
'Programming Language :: Python :: 3.6',
7069
'Programming Language :: Python :: 3.7',

0 commit comments

Comments
 (0)