Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,9 @@
from .source_control_update_parameters import SourceControlUpdateParameters
from .source_control_sync_job import SourceControlSyncJob
from .source_control_sync_job_create_parameters import SourceControlSyncJobCreateParameters
from .source_control_sync_job_by_id_errors import SourceControlSyncJobByIdErrors
from .source_control_sync_job_by_id import SourceControlSyncJobById
from .dsc_node import DscNode
from .dsc_node_configuration import DscNodeConfiguration
from .dsc_node_configuration_create_or_update_parameters_properties import DscNodeConfigurationCreateOrUpdateParametersProperties
from .automation_account_paged import AutomationAccountPaged
from .operation_paged import OperationPaged
from .statistics_paged import StatisticsPaged
Expand Down Expand Up @@ -181,6 +179,7 @@
LinuxUpdateClasses,
SourceType,
ProvisioningState,
StartType,
)

__all__ = [
Expand Down Expand Up @@ -300,11 +299,9 @@
'SourceControlUpdateParameters',
'SourceControlSyncJob',
'SourceControlSyncJobCreateParameters',
'SourceControlSyncJobByIdErrors',
'SourceControlSyncJobById',
'DscNode',
'DscNodeConfiguration',
'DscNodeConfigurationCreateOrUpdateParametersProperties',
'AutomationAccountPaged',
'OperationPaged',
'StatisticsPaged',
Expand Down Expand Up @@ -355,4 +352,5 @@
'LinuxUpdateClasses',
'SourceType',
'ProvisioningState',
'StartType',
]
Original file line number Diff line number Diff line change
Expand Up @@ -248,3 +248,9 @@ class ProvisioningState(Enum):
completed = "Completed"
failed = "Failed"
running = "Running"


class StartType(Enum):

auto_sync = "AutoSync"
manual_sync = "ManualSync"
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,57 @@ class DscNodeConfigurationCreateOrUpdateParameters(Model):

:param source: Gets or sets the source.
:type source: ~azure.mgmt.automation.models.ContentSource
:param name: Gets or sets the type of the parameter.
:param name: Name of the node configuration.
:type name: str
:param configuration: Gets or sets the configuration of the node.
:type configuration:
~azure.mgmt.automation.models.DscConfigurationAssociationProperty
:param new_node_configuration_build_version_required: If a new build
version of NodeConfiguration is required.
:type new_node_configuration_build_version_required: bool
:param source1: Gets or sets the source.
:type source1: ~azure.mgmt.automation.models.ContentSource
:param name1: Gets or sets the type of the parameter.
:type name1: str
:param configuration1: Gets or sets the configuration of the node.
:type configuration1:
~azure.mgmt.automation.models.DscConfigurationAssociationProperty
:param increment_node_configuration_build: If a new build version of
NodeConfiguration is required.
:type increment_node_configuration_build: bool
:param tags: Gets or sets the tags attached to the resource.
:type tags: dict[str, str]
"""

_validation = {
'source': {'required': True},
'name': {'required': True},
'configuration': {'required': True},
'source1': {'required': True},
'name1': {'required': True},
'configuration1': {'required': True},
}

_attribute_map = {
'source': {'key': 'source', 'type': 'ContentSource'},
'name': {'key': 'name', 'type': 'str'},
'configuration': {'key': 'configuration', 'type': 'DscConfigurationAssociationProperty'},
'new_node_configuration_build_version_required': {'key': 'newNodeConfigurationBuildVersionRequired', 'type': 'bool'},
'source1': {'key': 'properties.source', 'type': 'ContentSource'},
'name1': {'key': 'properties.name', 'type': 'str'},
'configuration1': {'key': 'properties.configuration', 'type': 'DscConfigurationAssociationProperty'},
'increment_node_configuration_build': {'key': 'properties.incrementNodeConfigurationBuild', 'type': 'bool'},
'tags': {'key': 'tags', 'type': '{str}'},
}

def __init__(self, source, name, configuration, new_node_configuration_build_version_required=None):
def __init__(self, source, name, configuration, source1, name1, configuration1, new_node_configuration_build_version_required=None, increment_node_configuration_build=None, tags=None):
super(DscNodeConfigurationCreateOrUpdateParameters, self).__init__()
self.source = source
self.name = name
self.configuration = configuration
self.new_node_configuration_build_version_required = new_node_configuration_build_version_required
self.source1 = source1
self.name1 = name1
self.configuration1 = configuration1
self.increment_node_configuration_build = increment_node_configuration_build
self.tags = tags

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ class HybridRunbookWorker(Model):
:param registration_time: Gets or sets the registration time of the worker
machine.
:type registration_time: datetime
:param last_seen_date_time: Last Heartbeat from the Worker
:type last_seen_date_time: datetime
"""

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'ip': {'key': 'ip', 'type': 'str'},
'registration_time': {'key': 'registrationTime', 'type': 'iso-8601'},
'last_seen_date_time': {'key': 'lastSeenDateTime', 'type': 'iso-8601'},
}

def __init__(self, name=None, ip=None, registration_time=None):
def __init__(self, name=None, ip=None, registration_time=None, last_seen_date_time=None):
super(HybridRunbookWorker, self).__init__()
self.name = name
self.ip = ip
self.registration_time = registration_time
self.last_seen_date_time = last_seen_date_time
9 changes: 5 additions & 4 deletions azure-mgmt-automation/azure/mgmt/automation/models/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,16 @@ class Job(ProxyResource):
:type last_status_modified_time: datetime
:param parameters: Gets or sets the parameters of the job.
:type parameters: dict[str, str]
:param provisioning_state: The provisioning state of a resource.
:type provisioning_state:
:ivar provisioning_state: The provisioning state of a resource.
:vartype provisioning_state:
~azure.mgmt.automation.models.JobProvisioningStateProperty
"""

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

_attribute_map = {
Expand All @@ -86,7 +87,7 @@ class Job(ProxyResource):
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'JobProvisioningStateProperty'},
}

def __init__(self, runbook=None, started_by=None, run_on=None, job_id=None, creation_time=None, status=None, status_details=None, start_time=None, end_time=None, exception=None, last_modified_time=None, last_status_modified_time=None, parameters=None, provisioning_state=None):
def __init__(self, runbook=None, started_by=None, run_on=None, job_id=None, creation_time=None, status=None, status_details=None, start_time=None, end_time=None, exception=None, last_modified_time=None, last_status_modified_time=None, parameters=None):
super(Job, self).__init__()
self.runbook = runbook
self.started_by = started_by
Expand All @@ -101,4 +102,4 @@ def __init__(self, runbook=None, started_by=None, run_on=None, job_id=None, crea
self.last_modified_time = last_modified_time
self.last_status_modified_time = last_status_modified_time
self.parameters = parameters
self.provisioning_state = provisioning_state
self.provisioning_state = None
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ class JobCollectionItem(ProxyResource):
:vartype end_time: datetime
:ivar last_modified_time: The last modified time of the job.
:vartype last_modified_time: datetime
:param provisioning_state: The current provisioning state of the job.
:type provisioning_state:
~azure.mgmt.automation.models.JobProvisioningStateProperty
:ivar provisioning_state: The provisioning state of a resource.
:vartype provisioning_state: str
:param run_on: Specifies the runOn group name where the job was executed.
:type run_on: str
"""

_validation = {
Expand All @@ -57,6 +58,7 @@ class JobCollectionItem(ProxyResource):
'start_time': {'readonly': True},
'end_time': {'readonly': True},
'last_modified_time': {'readonly': True},
'provisioning_state': {'readonly': True},
}

_attribute_map = {
Expand All @@ -70,10 +72,11 @@ class JobCollectionItem(ProxyResource):
'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
'last_modified_time': {'key': 'properties.lastModifiedTime', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'JobProvisioningStateProperty'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'run_on': {'key': 'properties.runOn', 'type': 'str'},
}

def __init__(self, provisioning_state=None):
def __init__(self, run_on=None):
super(JobCollectionItem, self).__init__()
self.runbook = None
self.job_id = None
Expand All @@ -82,4 +85,5 @@ def __init__(self, provisioning_state=None):
self.start_time = None
self.end_time = None
self.last_modified_time = None
self.provisioning_state = provisioning_state
self.provisioning_state = None
self.run_on = run_on
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,21 @@ class LinuxProperties(Model):
:param included_package_name_masks: packages included from the software
update configuration.
:type included_package_name_masks: list[str]
:param reboot_setting: Reboot setting for the software update
configuration.
:type reboot_setting: str
"""

_attribute_map = {
'included_package_classifications': {'key': 'includedPackageClassifications', 'type': 'str'},
'excluded_package_name_masks': {'key': 'excludedPackageNameMasks', 'type': '[str]'},
'included_package_name_masks': {'key': 'includedPackageNameMasks', 'type': '[str]'},
'reboot_setting': {'key': 'rebootSetting', 'type': 'str'},
}

def __init__(self, included_package_classifications=None, excluded_package_name_masks=None, included_package_name_masks=None):
def __init__(self, included_package_classifications=None, excluded_package_name_masks=None, included_package_name_masks=None, reboot_setting=None):
super(LinuxProperties, self).__init__()
self.included_package_classifications = included_package_classifications
self.excluded_package_name_masks = excluded_package_name_masks
self.included_package_name_masks = included_package_name_masks
self.reboot_setting = reboot_setting
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class SourceControlSyncJob(Model):
:vartype type: str
:ivar id: Resource id.
:vartype id: str
:param source_control_sync_job_id: Gets the source control sync job id.
:type source_control_sync_job_id: str
:param sync_job_id: Gets the source control sync job id.
:type sync_job_id: str
:ivar creation_time: Gets the creation time of the job.
:vartype creation_time: datetime
:param provisioning_state: Gets the provisioning state of the job.
Expand All @@ -36,8 +36,9 @@ class SourceControlSyncJob(Model):
:vartype start_time: datetime
:ivar end_time: Gets the end time of the job.
:vartype end_time: datetime
:param started_by: Gets the user who started the sync job.
:type started_by: str
:param start_type: Gets the type of start for the sync job. Possible
values include: 'AutoSync', 'ManualSync'
:type start_type: str or ~azure.mgmt.automation.models.StartType
"""

_validation = {
Expand All @@ -53,22 +54,22 @@ class SourceControlSyncJob(Model):
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'id': {'key': 'id', 'type': 'str'},
'source_control_sync_job_id': {'key': 'properties.sourceControlSyncJobId', 'type': 'str'},
'sync_job_id': {'key': 'properties.syncJobId', 'type': 'str'},
'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
'started_by': {'key': 'properties.startedBy', 'type': 'str'},
'start_type': {'key': 'properties.startType', 'type': 'str'},
}

def __init__(self, source_control_sync_job_id=None, provisioning_state=None, started_by=None):
def __init__(self, sync_job_id=None, provisioning_state=None, start_type=None):
super(SourceControlSyncJob, self).__init__()
self.name = None
self.type = None
self.id = None
self.source_control_sync_job_id = source_control_sync_job_id
self.sync_job_id = sync_job_id
self.creation_time = None
self.provisioning_state = provisioning_state
self.start_time = None
self.end_time = None
self.started_by = started_by
self.start_type = start_type
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ class SourceControlSyncJobById(Model):

:param id: Gets the id of the job.
:type id: str
:param source_control_sync_job_id: Gets the source control sync job id.
:type source_control_sync_job_id: str
:param sync_job_id: Gets the source control sync job id.
:type sync_job_id: str
:ivar creation_time: Gets the creation time of the job.
:vartype creation_time: datetime
:param provisioning_state: Gets the provisioning state of the job.
Expand All @@ -32,10 +32,12 @@ class SourceControlSyncJobById(Model):
:vartype start_time: datetime
:ivar end_time: Gets the end time of the job.
:vartype end_time: datetime
:param started_by: Gets the user who started the sync job.
:type started_by: str
:param errors: Error details of the source control sync job.
:type errors: ~azure.mgmt.automation.models.SourceControlSyncJobByIdErrors
:param start_type: Gets the type of start for the sync job. Possible
values include: 'AutoSync', 'ManualSync'
:type start_type: str or ~azure.mgmt.automation.models.StartType
:param exception: Gets the exceptions that occured while running the sync
job.
:type exception: str
"""

_validation = {
Expand All @@ -46,22 +48,22 @@ class SourceControlSyncJobById(Model):

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'source_control_sync_job_id': {'key': 'properties.sourceControlSyncJobId', 'type': 'str'},
'sync_job_id': {'key': 'properties.syncJobId', 'type': 'str'},
'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
'started_by': {'key': 'properties.startedBy', 'type': 'str'},
'errors': {'key': 'properties.errors', 'type': 'SourceControlSyncJobByIdErrors'},
'start_type': {'key': 'properties.startType', 'type': 'str'},
'exception': {'key': 'properties.exception', 'type': 'str'},
}

def __init__(self, id=None, source_control_sync_job_id=None, provisioning_state=None, started_by=None, errors=None):
def __init__(self, id=None, sync_job_id=None, provisioning_state=None, start_type=None, exception=None):
super(SourceControlSyncJobById, self).__init__()
self.id = id
self.source_control_sync_job_id = source_control_sync_job_id
self.sync_job_id = sync_job_id
self.creation_time = None
self.provisioning_state = provisioning_state
self.start_time = None
self.end_time = None
self.started_by = started_by
self.errors = errors
self.start_type = start_type
self.exception = exception
Loading