[AutoPR automation/resource-manager] Fix Automation swagger spec errors in the AutomationAccount and Webhook areas

azure-mgmt-automation/azure/mgmt/automation/automation_client.py

@@ -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
@@ -122,8 +121,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
@@ -219,8 +216,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(

azure-mgmt-automation/azure/mgmt/automation/models/__init__.py

@@ -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
@@ -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
@@ -79,10 +78,8 @@
 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 .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
@@ -182,6 +179,9 @@
     'Runbook',
     'ModuleErrorInfo',
     'Module',
+    'DscNodeExtensionHandlerAssociationProperty',
+    'DscNodeConfigurationAssociationProperty',
+    'DscNode',
     'ContentSource',
     'DscConfigurationParameter',
     'DscConfiguration',
@@ -216,13 +216,9 @@
     'AgentRegistrationRegenerateKeyParameter',
     'DscConfigurationAssociationProperty',
     'DscCompilationJobCreateParameters',
-    'ProvisioningStateProperty',
     'DscCompilationJob',
     'DscConfigurationCreateOrUpdateParameters',
     'DscMetaConfiguration',
-    'DscNodeConfigurationAssociationProperty',
-    'DscNodeExtensionHandlerAssociationProperty',
-    'DscNode',
     'DscNodeConfigurationCreateOrUpdateParameters',
     'DscNodeConfiguration',
     'DscNodeUpdateParameters',
@@ -241,10 +237,8 @@
     'JobScheduleCreateParameters',
     'JobSchedule',
     'JobStream',
-    'JobStreamListResult',
     'ModuleCreateOrUpdateParameters',
     'ModuleUpdateParameters',
-    'ProxyResource',
     'RunbookDraftUndoEditResult',
     'RunbookCreateOrUpdateParameters',
     'RunbookCreateOrUpdateDraftProperties',

azure-mgmt-automation/azure/mgmt/automation/models/agent_registration_regenerate_key_parameter.py

@@ -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.

azure-mgmt-automation/azure/mgmt/automation/models/automation_client_enums.py

@@ -98,8 +98,8 @@ class ScheduleDay(Enum):
 
 class AgentRegistrationKeyName(Enum):
 
-    primary = "primary"
-    secondary = "secondary"
+    primary = "Primary"
+    secondary = "Secondary"
 
 
 class JobStatus(Enum):
@@ -226,6 +226,6 @@ class SourceType(Enum):
 
 class ProvisioningState(Enum):
 
-    completed = "Completed"
+    succeeded = "Succeeded"
     failed = "Failed"
     running = "Running"

azure-mgmt-automation/azure/mgmt/automation/models/certificate.py

@@ -22,8 +22,6 @@ class Certificate(Model):
     :vartype id: str
     :ivar name: Gets the name of the certificate.
     :vartype name: str
-    :ivar type: Resource type
-    :vartype type: str
     :ivar thumbprint: Gets the thumbprint of the certificate.
     :vartype thumbprint: str
     :ivar expiry_time: Gets the expiry time of the certificate.
@@ -41,7 +39,6 @@ class Certificate(Model):
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
-        'type': {'readonly': True},
         'thumbprint': {'readonly': True},
         'expiry_time': {'readonly': True},
         'is_exportable': {'readonly': True},
@@ -52,7 +49,6 @@ class Certificate(Model):
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'},
         'expiry_time': {'key': 'properties.expiryTime', 'type': 'iso-8601'},
         'is_exportable': {'key': 'properties.isExportable', 'type': 'bool'},
@@ -65,7 +61,6 @@ def __init__(self, description=None):
         super(Certificate, self).__init__()
         self.id = None
         self.name = None
-        self.type = None
         self.thumbprint = None
         self.expiry_time = None
         self.is_exportable = None

azure-mgmt-automation/azure/mgmt/automation/models/certificate_update_parameters.py

@@ -21,12 +21,16 @@ class CertificateUpdateParameters(Model):
     :type description: str
     """
 
+    _validation = {
+        'name': {'required': True},
+    }
+
     _attribute_map = {
         'name': {'key': 'name', 'type': 'str'},
         'description': {'key': 'properties.description', 'type': 'str'},
     }
 
-    def __init__(self, name=None, description=None):
+    def __init__(self, name, description=None):
         super(CertificateUpdateParameters, self).__init__()
         self.name = name
         self.description = description

azure-mgmt-automation/azure/mgmt/automation/models/connection.py

@@ -22,8 +22,6 @@ class Connection(Model):
     :vartype id: str
     :ivar name: Gets the name of the connection.
     :vartype name: str
-    :ivar type: Resource type
-    :vartype type: str
     :param connection_type: Gets or sets the connectionType of the connection.
     :type connection_type:
      ~azure.mgmt.automation.models.ConnectionTypeAssociationProperty
@@ -41,7 +39,6 @@ class Connection(Model):
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
-        'type': {'readonly': True},
         'field_definition_values': {'readonly': True},
         'creation_time': {'readonly': True},
         'last_modified_time': {'readonly': True},
@@ -50,7 +47,6 @@ class Connection(Model):
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'connection_type': {'key': 'properties.connectionType', 'type': 'ConnectionTypeAssociationProperty'},
         'field_definition_values': {'key': 'properties.fieldDefinitionValues', 'type': '{str}'},
         'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
@@ -62,7 +58,6 @@ def __init__(self, connection_type=None, description=None):
         super(Connection, self).__init__()
         self.id = None
         self.name = None
-        self.type = None
         self.connection_type = connection_type
         self.field_definition_values = None
         self.creation_time = None

azure-mgmt-automation/azure/mgmt/automation/models/connection_type.py

@@ -22,8 +22,6 @@ class ConnectionType(Model):
     :vartype id: str
     :ivar name: Gets the name of the connection type.
     :vartype name: str
-    :ivar type: Resource type
-    :vartype type: str
     :param is_global: Gets or sets a Boolean value to indicate if the
      connection type is global.
     :type is_global: bool
@@ -42,15 +40,13 @@ class ConnectionType(Model):
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
-        'type': {'readonly': True},
         'field_definitions': {'readonly': True},
         'creation_time': {'readonly': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'is_global': {'key': 'properties.isGlobal', 'type': 'bool'},
         'field_definitions': {'key': 'properties.fieldDefinitions', 'type': '{FieldDefinition}'},
         'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
@@ -62,7 +58,6 @@ def __init__(self, is_global=None, last_modified_time=None, description=None):
         super(ConnectionType, self).__init__()
         self.id = None
         self.name = None
-        self.type = None
         self.is_global = is_global
         self.field_definitions = None
         self.creation_time = None

azure-mgmt-automation/azure/mgmt/automation/models/credential.py

@@ -20,10 +20,8 @@ class Credential(Model):
 
     :ivar id: Gets the id of the resource.
     :vartype id: str
-    :ivar name: Gets the name of the credential.
-    :vartype name: str
-    :ivar type: Resource type
-    :vartype type: str
+    :param name: Gets the name of the credential.
+    :type name: str
     :ivar user_name: Gets the user name of the credential.
     :vartype user_name: str
     :ivar creation_time: Gets the creation time.
@@ -36,8 +34,6 @@ class Credential(Model):
 
     _validation = {
         'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
         'user_name': {'readonly': True},
         'creation_time': {'readonly': True},
         'last_modified_time': {'readonly': True},
@@ -46,18 +42,16 @@ class Credential(Model):
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
         'user_name': {'key': 'properties.userName', 'type': 'str'},
         'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
         'last_modified_time': {'key': 'properties.lastModifiedTime', 'type': 'iso-8601'},
         'description': {'key': 'properties.description', 'type': 'str'},
     }
 
-    def __init__(self, description=None):
+    def __init__(self, name=None, description=None):
         super(Credential, self).__init__()
         self.id = None
-        self.name = None
-        self.type = None
+        self.name = name
         self.user_name = None
         self.creation_time = None
         self.last_modified_time = None

azure-mgmt-automation/azure/mgmt/automation/models/credential_update_parameters.py

@@ -25,14 +25,18 @@ class CredentialUpdateParameters(Model):
     :type description: str
     """
 
+    _validation = {
+        'name': {'required': True},
+    }
+
     _attribute_map = {
         'name': {'key': 'name', 'type': 'str'},
         'user_name': {'key': 'properties.userName', 'type': 'str'},
         'password': {'key': 'properties.password', 'type': 'str'},
         'description': {'key': 'properties.description', 'type': 'str'},
     }
 
-    def __init__(self, name=None, user_name=None, password=None, description=None):
+    def __init__(self, name, user_name=None, password=None, description=None):
         super(CredentialUpdateParameters, self).__init__()
         self.name = name
         self.user_name = user_name

azure-mgmt-automation/azure/mgmt/automation/models/dsc_compilation_job.py

@@ -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
@@ -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',
@@ -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},
@@ -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'},
@@ -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