Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions azure-mgmt-automation/azure/mgmt/automation/automation_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from .operations.connection_type_operations import ConnectionTypeOperations
from .operations.credential_operations import CredentialOperations
from .operations.dsc_compilation_job_operations import DscCompilationJobOperations
from .operations.dsc_compilation_job_stream_operations import DscCompilationJobStreamOperations
from .operations.dsc_configuration_operations import DscConfigurationOperations
from .operations.agent_registration_information_operations import AgentRegistrationInformationOperations
from .operations.dsc_node_operations import DscNodeOperations
Expand All @@ -32,6 +31,7 @@
from .operations.job_operations import JobOperations
from .operations.job_stream_operations import JobStreamOperations
from .operations.job_schedule_operations import JobScheduleOperations
from .operations.linked_workspace_operations import LinkedWorkspaceOperations
from .operations.activity_operations import ActivityOperations
from .operations.module_operations import ModuleOperations
from .operations.object_data_types_operations import ObjectDataTypesOperations
Expand Down Expand Up @@ -122,8 +122,6 @@ class AutomationClient(object):
:vartype credential: azure.mgmt.automation.operations.CredentialOperations
:ivar dsc_compilation_job: DscCompilationJob operations
:vartype dsc_compilation_job: azure.mgmt.automation.operations.DscCompilationJobOperations
:ivar dsc_compilation_job_stream: DscCompilationJobStream operations
:vartype dsc_compilation_job_stream: azure.mgmt.automation.operations.DscCompilationJobStreamOperations
:ivar dsc_configuration: DscConfiguration operations
:vartype dsc_configuration: azure.mgmt.automation.operations.DscConfigurationOperations
:ivar agent_registration_information: AgentRegistrationInformation operations
Expand All @@ -142,6 +140,8 @@ class AutomationClient(object):
:vartype job_stream: azure.mgmt.automation.operations.JobStreamOperations
:ivar job_schedule: JobSchedule operations
:vartype job_schedule: azure.mgmt.automation.operations.JobScheduleOperations
:ivar linked_workspace: LinkedWorkspace operations
:vartype linked_workspace: azure.mgmt.automation.operations.LinkedWorkspaceOperations
:ivar activity: Activity operations
:vartype activity: azure.mgmt.automation.operations.ActivityOperations
:ivar module: Module operations
Expand Down Expand Up @@ -219,8 +219,6 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.dsc_compilation_job = DscCompilationJobOperations(
self._client, self.config, self._serialize, self._deserialize)
self.dsc_compilation_job_stream = DscCompilationJobStreamOperations(
self._client, self.config, self._serialize, self._deserialize)
self.dsc_configuration = DscConfigurationOperations(
self._client, self.config, self._serialize, self._deserialize)
self.agent_registration_information = AgentRegistrationInformationOperations(
Expand All @@ -239,6 +237,8 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.job_schedule = JobScheduleOperations(
self._client, self.config, self._serialize, self._deserialize)
self.linked_workspace = LinkedWorkspaceOperations(
self._client, self.config, self._serialize, self._deserialize)
self.activity = ActivityOperations(
self._client, self.config, self._serialize, self._deserialize)
self.module = ModuleOperations(
Expand Down
20 changes: 8 additions & 12 deletions azure-mgmt-automation/azure/mgmt/automation/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
from .runbook import Runbook
from .module_error_info import ModuleErrorInfo
from .module import Module
from .dsc_node_extension_handler_association_property import DscNodeExtensionHandlerAssociationProperty
from .dsc_node_configuration_association_property import DscNodeConfigurationAssociationProperty
from .dsc_node import DscNode
from .content_source import ContentSource
from .dsc_configuration_parameter import DscConfigurationParameter
from .dsc_configuration import DscConfiguration
Expand Down Expand Up @@ -54,13 +57,9 @@
from .agent_registration_regenerate_key_parameter import AgentRegistrationRegenerateKeyParameter
from .dsc_configuration_association_property import DscConfigurationAssociationProperty
from .dsc_compilation_job_create_parameters import DscCompilationJobCreateParameters
from .provisioning_state_property import ProvisioningStateProperty
from .dsc_compilation_job import DscCompilationJob
from .dsc_configuration_create_or_update_parameters import DscConfigurationCreateOrUpdateParameters
from .dsc_meta_configuration import DscMetaConfiguration
from .dsc_node_configuration_association_property import DscNodeConfigurationAssociationProperty
from .dsc_node_extension_handler_association_property import DscNodeExtensionHandlerAssociationProperty
from .dsc_node import DscNode
from .dsc_node_configuration_create_or_update_parameters import DscNodeConfigurationCreateOrUpdateParameters
from .dsc_node_configuration import DscNodeConfiguration
from .dsc_node_update_parameters import DscNodeUpdateParameters
Expand All @@ -79,10 +78,9 @@
from .job_schedule_create_parameters import JobScheduleCreateParameters
from .job_schedule import JobSchedule
from .job_stream import JobStream
from .job_stream_list_result import JobStreamListResult
from .linked_workspace import LinkedWorkspace
from .module_create_or_update_parameters import ModuleCreateOrUpdateParameters
from .module_update_parameters import ModuleUpdateParameters
from .proxy_resource import ProxyResource
from .runbook_draft_undo_edit_result import RunbookDraftUndoEditResult
from .runbook_create_or_update_parameters import RunbookCreateOrUpdateParameters
from .runbook_create_or_update_draft_properties import RunbookCreateOrUpdateDraftProperties
Expand Down Expand Up @@ -182,6 +180,9 @@
'Runbook',
'ModuleErrorInfo',
'Module',
'DscNodeExtensionHandlerAssociationProperty',
'DscNodeConfigurationAssociationProperty',
'DscNode',
'ContentSource',
'DscConfigurationParameter',
'DscConfiguration',
Expand Down Expand Up @@ -216,13 +217,9 @@
'AgentRegistrationRegenerateKeyParameter',
'DscConfigurationAssociationProperty',
'DscCompilationJobCreateParameters',
'ProvisioningStateProperty',
'DscCompilationJob',
'DscConfigurationCreateOrUpdateParameters',
'DscMetaConfiguration',
'DscNodeConfigurationAssociationProperty',
'DscNodeExtensionHandlerAssociationProperty',
'DscNode',
'DscNodeConfigurationCreateOrUpdateParameters',
'DscNodeConfiguration',
'DscNodeUpdateParameters',
Expand All @@ -241,10 +238,9 @@
'JobScheduleCreateParameters',
'JobSchedule',
'JobStream',
'JobStreamListResult',
'LinkedWorkspace',
'ModuleCreateOrUpdateParameters',
'ModuleUpdateParameters',
'ProxyResource',
'RunbookDraftUndoEditResult',
'RunbookCreateOrUpdateParameters',
'RunbookCreateOrUpdateDraftProperties',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
class AgentRegistrationRegenerateKeyParameter(Model):
"""The parameters supplied to the regenerate keys operation.

:param key_name: Gets or sets the agent registration key name - primary or
secondary. Possible values include: 'primary', 'secondary'
:param key_name: Gets or sets the agent registration key name - Primary or
Secondary. Possible values include: 'Primary', 'Secondary'
:type key_name: str or
~azure.mgmt.automation.models.AgentRegistrationKeyName
:param name: Gets or sets the name of the resource.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ class ScheduleDay(Enum):

class AgentRegistrationKeyName(Enum):

primary = "primary"
secondary = "secondary"
primary = "Primary"
secondary = "Secondary"


class JobStatus(Enum):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,17 @@
# regenerated.
# --------------------------------------------------------------------------

from .proxy_resource import ProxyResource
from msrest.serialization import Model


class DscCompilationJob(ProxyResource):
class DscCompilationJob(Model):
"""Definition of the Dsc Compilation job.

Variables are only populated by the server, and will be ignored when
sending a request.

:ivar id: Resource Id
:ivar id: Gets the id of the resource.
:vartype id: str
:ivar name: Resource name
:vartype name: str
:ivar type: Resource type
:vartype type: str
:param configuration: Gets or sets the configuration.
:type configuration:
~azure.mgmt.automation.models.DscConfigurationAssociationProperty
Expand All @@ -33,12 +29,6 @@ class DscCompilationJob(ProxyResource):
:vartype job_id: str
:ivar creation_time: Gets the creation time of the job.
:vartype creation_time: datetime
:param provisioning_state: The current provisioning state of the job.
:type provisioning_state:
~azure.mgmt.automation.models.ProvisioningStateProperty
:param run_on: Gets or sets the runOn which specifies the group name where
the job is to be executed.
:type run_on: str
:param status: Gets or sets the status of the job. Possible values
include: 'New', 'Activating', 'Running', 'Completed', 'Failed', 'Stopped',
'Blocked', 'Suspended', 'Disconnected', 'Suspending', 'Stopping',
Expand All @@ -63,8 +53,6 @@ class DscCompilationJob(ProxyResource):

_validation = {
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
'started_by': {'readonly': True},
'job_id': {'readonly': True},
'creation_time': {'readonly': True},
Expand All @@ -77,14 +65,10 @@ class DscCompilationJob(ProxyResource):

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'configuration': {'key': 'properties.configuration', 'type': 'DscConfigurationAssociationProperty'},
'started_by': {'key': 'properties.startedBy', 'type': 'str'},
'job_id': {'key': 'properties.jobId', 'type': 'str'},
'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'ProvisioningStateProperty'},
'run_on': {'key': 'properties.runOn', 'type': 'str'},
'status': {'key': 'properties.status', 'type': 'str'},
'status_details': {'key': 'properties.statusDetails', 'type': 'str'},
'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
Expand All @@ -95,14 +79,13 @@ class DscCompilationJob(ProxyResource):
'parameters': {'key': 'properties.parameters', 'type': '{str}'},
}

def __init__(self, configuration=None, provisioning_state=None, run_on=None, status=None, status_details=None, parameters=None):
def __init__(self, configuration=None, status=None, status_details=None, parameters=None):
super(DscCompilationJob, self).__init__()
self.id = None
self.configuration = configuration
self.started_by = None
self.job_id = None
self.creation_time = None
self.provisioning_state = provisioning_state
self.run_on = run_on
self.status = status
self.status_details = status_details
self.start_time = None
Expand Down
15 changes: 11 additions & 4 deletions azure-mgmt-automation/azure/mgmt/automation/models/dsc_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
# regenerated.
# --------------------------------------------------------------------------

from .proxy_resource import ProxyResource
from .resource import Resource


class DscNode(ProxyResource):
class DscNode(Resource):
"""Definition of the dsc node type.

Variables are only populated by the server, and will be ignored when
Expand All @@ -24,6 +24,10 @@ class DscNode(ProxyResource):
:vartype name: str
:ivar type: Resource type
:vartype type: str
:param location: Resource location
:type location: str
:param tags: Resource tags
:type tags: dict[str, str]
:param last_seen: Gets or sets the last seen time of the node.
:type last_seen: datetime
:param registration_time: Gets or sets the registration time of the node.
Expand Down Expand Up @@ -51,12 +55,15 @@ class DscNode(ProxyResource):
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
'location': {'required': True},
}

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
'last_seen': {'key': 'lastSeen', 'type': 'iso-8601'},
'registration_time': {'key': 'registrationTime', 'type': 'iso-8601'},
'ip': {'key': 'ip', 'type': 'str'},
Expand All @@ -68,8 +75,8 @@ class DscNode(ProxyResource):
'extension_handler': {'key': 'extensionHandler', 'type': '[DscNodeExtensionHandlerAssociationProperty]'},
}

def __init__(self, last_seen=None, registration_time=None, ip=None, account_id=None, node_configuration=None, status=None, node_id=None, etag=None, extension_handler=None):
super(DscNode, self).__init__()
def __init__(self, location, tags=None, last_seen=None, registration_time=None, ip=None, account_id=None, node_configuration=None, status=None, node_id=None, etag=None, extension_handler=None):
super(DscNode, self).__init__(location=location, tags=tags)
self.last_seen = last_seen
self.registration_time = registration_time
self.ip = ip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,37 @@
# regenerated.
# --------------------------------------------------------------------------

from .proxy_resource import ProxyResource
from msrest.serialization import Model


class DscNodeConfiguration(ProxyResource):
class DscNodeConfiguration(Model):
"""Definition of the dsc node configuration.

Variables are only populated by the server, and will be ignored when
sending a request.

:ivar id: Resource Id
:vartype id: str
:ivar name: Resource name
:vartype name: str
:ivar type: Resource type
:vartype type: str
:param name: Gets or sets the node configuration name.
:type name: str
:param last_modified_time: Gets or sets the last modified time.
:type last_modified_time: datetime
:param creation_time: Gets or sets creation time.
:type creation_time: datetime
:param configuration: Gets or sets the configuration of the node.
:type configuration:
~azure.mgmt.automation.models.DscConfigurationAssociationProperty
:param id: Gets or sets the id of the resource.
:type id: str
"""

_validation = {
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
}

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'last_modified_time': {'key': 'lastModifiedTime', 'type': 'iso-8601'},
'creation_time': {'key': 'creationTime', 'type': 'iso-8601'},
'configuration': {'key': 'configuration', 'type': 'DscConfigurationAssociationProperty'},
'id': {'key': 'id', 'type': 'str'},
}

def __init__(self, last_modified_time=None, creation_time=None, configuration=None):
def __init__(self, name=None, last_modified_time=None, creation_time=None, configuration=None, id=None):
super(DscNodeConfiguration, self).__init__()
self.name = name
self.last_modified_time = last_modified_time
self.creation_time = creation_time
self.configuration = configuration
self.id = id

This file was deleted.

Loading