Skip to content

Commit

Permalink
Merge pull request #867 from AutorestCI/RestAPI-PR677
Browse files Browse the repository at this point in the history
Automatic PR from RestAPI-PR677
  • Loading branch information
lmazuel committed Nov 10, 2016
2 parents da8db3e + 1f27fb9 commit aeb4442
Show file tree
Hide file tree
Showing 16 changed files with 130 additions and 121 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ class EventHubManagementClientConfiguration(AzureConfiguration):
:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
object<msrestazure.azure_active_directory>`
:param subscription_id: Subscription credentials which uniquely identify
:param subscription_id: Subscription credentials that uniquely identify a
Microsoft Azure subscription. The subscription ID forms part of the URI
for every service call.
:type subscription_id: str
:param api_version: Client Api Version.
:param api_version: Client API Version.
:type api_version: str
:param accept_language: Gets or sets the preferred language for the
response.
Expand Down Expand Up @@ -77,7 +77,7 @@ def __init__(


class EventHubManagementClient(object):
"""Azure EventHub client
"""Azure Event Hubs client
:ivar config: Configuration for client.
:vartype config: EventHubManagementClientConfiguration
Expand All @@ -92,11 +92,11 @@ class EventHubManagementClient(object):
:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
object<msrestazure.azure_active_directory>`
:param subscription_id: Subscription credentials which uniquely identify
:param subscription_id: Subscription credentials that uniquely identify a
Microsoft Azure subscription. The subscription ID forms part of the URI
for every service call.
:type subscription_id: str
:param api_version: Client Api Version.
:param api_version: Client API Version.
:type api_version: str
:param accept_language: Gets or sets the preferred language for the
response.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class ConsumerGroupCreateOrUpdateParameters(Model):
"""Parameters supplied to the CreateOrUpdate Consumer Group operation.
"""Parameters supplied to the Create Or Update Consumer Group operation.
:param location: Location of the resource.
:type location: str
Expand All @@ -23,9 +23,9 @@ class ConsumerGroupCreateOrUpdateParameters(Model):
:type name: str
:param created_at: Exact time the message was created.
:type created_at: datetime
:param event_hub_path: The path of the event hub.
:param event_hub_path: The path of the Event Hub.
:type event_hub_path: str
:param updated_at: The exact time the message has been updated.
:param updated_at: The exact time the message was updated.
:type updated_at: datetime
:param user_metadata: The user metadata.
:type user_metadata: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class ConsumerGroupResource(Resource):
"""Description of Consumer Group Resource.
"""Description of the consumer group resource.
Variables are only populated by the server, and will be ignored when
sending a request.
Expand All @@ -30,9 +30,9 @@ class ConsumerGroupResource(Resource):
:type tags: dict
:param created_at: Exact time the message was created.
:type created_at: datetime
:param event_hub_path: The path of the event hub.
:param event_hub_path: The path of the Event Hub.
:type event_hub_path: str
:param updated_at: The exact time the message has been updated.
:param updated_at: The exact time the message was updated.
:type updated_at: datetime
:param user_metadata: The user metadata.
:type user_metadata: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class EventHubCreateOrUpdateParameters(Model):
"""Parameters supplied to the CreateOrUpdate EventHub operation.
"""Parameters supplied to the Create Or Update Event Hub operation.
:param location: Location of the resource.
:type location: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
class EventHubProperties(Model):
"""EventHubProperties.
:param created_at: Exact time the Event was created.
:param created_at: Exact time the Event Hub was created.
:type created_at: datetime
:param message_retention_in_days: Number of days to retain the events for
this Event Hub.
:type message_retention_in_days: long
:param partition_count: Number of partitions created for EventHub.
:param partition_count: Number of partitions created for the Event Hub.
:type partition_count: long
:param partition_ids: Current number of shards on the Event Hub.
:type partition_ids: list of str
:param status: Enumerates the possible values for the status of the
EventHub. Possible values include: 'Active', 'Disabled', 'Restoring',
:param status: Enumerates the possible values for the status of the Event
Hub. Possible values include: 'Active', 'Disabled', 'Restoring',
'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming',
'Unknown'
:type status: str or :class:`EntityStatus
<azure.mgmt.eventhub.models.EntityStatus>`
:param updated_at: The exact time the message has been updated.
:param updated_at: The exact time the message was updated.
:type updated_at: datetime
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class EventHubResource(Resource):
"""Description of EventHub Resource.
"""Description of the Event Hub resource.
Variables are only populated by the server, and will be ignored when
sending a request.
Expand All @@ -28,22 +28,22 @@ class EventHubResource(Resource):
:type location: str
:param tags: Resource tags
:type tags: dict
:param created_at: Exact time the Event was created.
:param created_at: Exact time the Event Hub was created.
:type created_at: datetime
:param message_retention_in_days: Number of days to retain the events for
this Event Hub.
:type message_retention_in_days: long
:param partition_count: Number of partitions created for EventHub.
:param partition_count: Number of partitions created for the Event Hub.
:type partition_count: long
:param partition_ids: Current number of shards on the Event Hub.
:type partition_ids: list of str
:param status: Enumerates the possible values for the status of the
EventHub. Possible values include: 'Active', 'Disabled', 'Restoring',
:param status: Enumerates the possible values for the status of the Event
Hub. Possible values include: 'Active', 'Disabled', 'Restoring',
'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming',
'Unknown'
:type status: str or :class:`EntityStatus
<azure.mgmt.eventhub.models.EntityStatus>`
:param updated_at: The exact time the message has been updated.
:param updated_at: The exact time the message was updated.
:type updated_at: datetime
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@


class NamespaceCreateOrUpdateParameters(Model):
"""Parameters supplied to the CreateOrUpdate Namespace operation.
"""Parameters supplied to the Create Or Update Namespace operation.
:param location: Namespace location.
:type location: str
:param sku:
:type sku: :class:`Sku <azure.mgmt.eventhub.models.Sku>`
:param tags: Namespace tags.
:type tags: dict
:param provisioning_state: Provisioning state of the Namespace.
:param provisioning_state: Provisioning state of the namespace.
:type provisioning_state: str
:param status: State of the namespace. Possible values include:
'Unknown', 'Creating', 'Created', 'Activating', 'Enabling', 'Active',
Expand All @@ -33,10 +33,10 @@ class NamespaceCreateOrUpdateParameters(Model):
:type created_at: datetime
:param updated_at: The time the namespace was updated.
:type updated_at: datetime
:param service_bus_endpoint: Endpoint you can use to perform ServiceBus
:param service_bus_endpoint: Endpoint you can use to perform Service Bus
operations.
:type service_bus_endpoint: str
:param create_acs_namespace: Indicates whether to create ACS namespace.
:param create_acs_namespace: Indicates whether to create an ACS namespace.
:type create_acs_namespace: bool
:param enabled: Specifies whether this instance is enabled.
:type enabled: bool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class NamespaceResource(Resource):
"""Description of a Namespace resource.
"""Description of a namespace resource.
Variables are only populated by the server, and will be ignored when
sending a request.
Expand All @@ -30,7 +30,7 @@ class NamespaceResource(Resource):
:type tags: dict
:param sku:
:type sku: :class:`Sku <azure.mgmt.eventhub.models.Sku>`
:param provisioning_state: Provisioning state of the Namespace.
:param provisioning_state: Provisioning state of the namespace.
:type provisioning_state: str
:param status: State of the namespace. Possible values include:
'Unknown', 'Creating', 'Created', 'Activating', 'Enabling', 'Active',
Expand All @@ -42,10 +42,10 @@ class NamespaceResource(Resource):
:type created_at: datetime
:param updated_at: The time the namespace was updated.
:type updated_at: datetime
:param service_bus_endpoint: Endpoint you can use to perform ServiceBus
:param service_bus_endpoint: Endpoint you can use to perform Service Bus
operations.
:type service_bus_endpoint: str
:param create_acs_namespace: Indicates whether to create ACS namespace.
:param create_acs_namespace: Indicates whether to create an ACS namespace.
:type create_acs_namespace: bool
:param enabled: Specifies whether this instance is enabled.
:type enabled: bool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@


class RegenerateKeysParameters(Model):
"""Parameters supplied to the Regenerate Auth Rule.
"""Parameters supplied to the Regenerate Authorization Rule operation.
:param policykey: Key that needs to be regenerated . Possible values
:param policykey: Key that needs to be regenerated. Possible values
include: 'PrimaryKey', 'SecondaryKey'
:type policykey: str or :class:`Policykey
<azure.mgmt.eventhub.models.Policykey>`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
class ResourceListKeys(Model):
"""Namespace/EventHub Connection String.
:param primary_connection_string: PrimaryConnectionString of the created
Namespace AuthorizationRule.
:param primary_connection_string: Primary connection string of the
created namespace authorization rule.
:type primary_connection_string: str
:param secondary_connection_string: SecondaryConnectionString of the
created Namespace AuthorizationRule
:param secondary_connection_string: Secondary connection string of the
created namespace authorization rule.
:type secondary_connection_string: str
:param primary_key: A base64-encoded 256-bit primary key for signing and
validating the SAS token
validating the SAS token.
:type primary_key: str
:param secondary_key: A base64-encoded 256-bit primary key for signing
and validating the SAS token
and validating the SAS token.
:type secondary_key: str
:param key_name: A string that describes the authorization rule
:param key_name: A string that describes the authorization rule.
:type key_name: str
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@


class SharedAccessAuthorizationRuleCreateOrUpdateParameters(Model):
"""Parameters supplied to the CreateOrUpdate AuthorizationRules.
"""Parameters supplied to the Create Or Update Authorization Rules operation.
:param location: data center location.
:param location: Data center location.
:type location: str
:param name: Name of the AuthorizationRule.
:param name: Name of the authorization rule.
:type name: str
:param rights: The rights associated with the rule.
:type rights: list of str or :class:`AccessRights
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class SharedAccessAuthorizationRuleResource(Resource):
"""Description of a Namespace AuthorizationRules.
"""Description of a namespace authorization rule.
Variables are only populated by the server, and will be ignored when
sending a request.
Expand Down
10 changes: 5 additions & 5 deletions azure-mgmt-eventhub/azure/mgmt/eventhub/models/sku.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@


class Sku(Model):
"""Sku of the Namespace.
"""SKU of the namespace.
:param name: Name of this Sku. Possible values include: 'Basic',
:param name: Name of this SKU. Possible values include: 'Basic',
'Standard', 'Premium'
:type name: str or :class:`SkuName <azure.mgmt.eventhub.models.SkuName>`
:param tier: The tier of this particular SKU. Possible values include:
'Basic', 'Standard', 'Premium'
:param tier: The billing tier of this particular SKU. Possible values
include: 'Basic', 'Standard', 'Premium'
:type tier: str or :class:`SkuTier <azure.mgmt.eventhub.models.SkuTier>`
:param capacity: The eventhub throughput units
:param capacity: The Event Hubs throughput units.
:type capacity: int
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ def __init__(self, client, config, serializer, deserializer):

def create_or_update(
self, resource_group_name, namespace_name, event_hub_name, consumer_group_name, parameters, custom_headers=None, raw=False, **operation_config):
"""Creates/Updates a consumer group as a nested resource within a
namespace.
"""Creates or updates an Event Hubs consumer group as a nested resource
within a namespace.
:param resource_group_name: The name of the resource group.
:type resource_group_name: str
:param namespace_name: The namespace name.
:type namespace_name: str
:param event_hub_name: The EventHub name.
:param event_hub_name: The Event Hub name.
:type event_hub_name: str
:param consumer_group_name: The Consumer Group name.
:param consumer_group_name: The consumer group name.
:type consumer_group_name: str
:param parameters: Parameters supplied to create a Consumer Group
Resource.
:param parameters: Parameters supplied to create a consumer group
resource.
:type parameters: :class:`ConsumerGroupCreateOrUpdateParameters
<azure.mgmt.eventhub.models.ConsumerGroupCreateOrUpdateParameters>`
:param dict custom_headers: headers that will be added to the request
Expand Down Expand Up @@ -112,16 +112,16 @@ def create_or_update(

def delete(
self, resource_group_name, namespace_name, event_hub_name, consumer_group_name, custom_headers=None, raw=False, **operation_config):
"""Deletes an ConsumerGroup from the specified EventHub and resource
"""Deletes a consumer group from the specified Event Hub and resource
group.
:param resource_group_name: The name of the resource group.
:type resource_group_name: str
:param namespace_name: The namespace name.
:type namespace_name: str
:param event_hub_name: The EventHub name.
:param event_hub_name: The Event Hub name.
:type event_hub_name: str
:param consumer_group_name: The Consumer Group name.
:param consumer_group_name: The Cconsumer group name.
:type consumer_group_name: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
Expand Down Expand Up @@ -173,15 +173,15 @@ def delete(

def get(
self, resource_group_name, namespace_name, event_hub_name, consumer_group_name, custom_headers=None, raw=False, **operation_config):
"""Returns an Consumer Group description for the specified Consumer Group.
"""Gets a description for the specified consumer group.
:param resource_group_name: The name of the resource group.
:type resource_group_name: str
:param namespace_name: The namespace name.
:type namespace_name: str
:param event_hub_name: The EventHub name.
:param event_hub_name: The Event Hub name.
:type event_hub_name: str
:param consumer_group_name: The Consumer Group name.
:param consumer_group_name: The consumer group name.
:type consumer_group_name: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
Expand Down Expand Up @@ -241,14 +241,14 @@ def get(

def list_all(
self, resource_group_name, namespace_name, event_hub_name, custom_headers=None, raw=False, **operation_config):
"""Enumerates the consumer groups in a namespace. An empty feed is
returned if no consumer group exists in the namespace.
"""Gets all the consumer groups in a namespace. An empty feed is returned
if no consumer group exists in the namespace.
:param resource_group_name: The name of the resource group.
:type resource_group_name: str
:param namespace_name: The namespace name.
:type namespace_name: str
:param event_hub_name: The EventHub name.
:param event_hub_name: The Event Hub name.
:type event_hub_name: str
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
Expand Down
Loading

0 comments on commit aeb4442

Please sign in to comment.