diff --git a/azure-mgmt-automation/azure/mgmt/automation/automation_client.py b/azure-mgmt-automation/azure/mgmt/automation/automation_client.py
index 3bd8a2628a02..a1d511e7d071 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/automation_client.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/automation_client.py
@@ -29,9 +29,8 @@
 from .operations.node_reports_operations import NodeReportsOperations
 from .operations.dsc_node_configuration_operations import DscNodeConfigurationOperations
 from .operations.hybrid_runbook_worker_group_operations import HybridRunbookWorkerGroupOperations
-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
@@ -39,7 +38,7 @@
 from .operations.runbook_draft_operations import RunbookDraftOperations
 from .operations.runbook_operations import RunbookOperations
 from .operations.test_job_streams_operations import TestJobStreamsOperations
-from .operations.test_jobs_operations import TestJobsOperations
+from .operations.test_job_operations import TestJobOperations
 from .operations.schedule_operations import ScheduleOperations
 from .operations.variable_operations import VariableOperations
 from .operations.webhook_operations import WebhookOperations
@@ -48,6 +47,8 @@
 from .operations.software_update_configuration_machine_runs_operations import SoftwareUpdateConfigurationMachineRunsOperations
 from .operations.source_control_operations import SourceControlOperations
 from .operations.source_control_sync_job_operations import SourceControlSyncJobOperations
+from .operations.job_operations import JobOperations
+from .operations.job_stream_operations import JobStreamOperations
 from . import models
 
 
@@ -136,12 +137,10 @@ class AutomationClient(object):
     :vartype dsc_node_configuration: azure.mgmt.automation.operations.DscNodeConfigurationOperations
     :ivar hybrid_runbook_worker_group: HybridRunbookWorkerGroup operations
     :vartype hybrid_runbook_worker_group: azure.mgmt.automation.operations.HybridRunbookWorkerGroupOperations
-    :ivar job: Job operations
-    :vartype job: azure.mgmt.automation.operations.JobOperations
-    :ivar job_stream: JobStream operations
-    :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
@@ -156,8 +155,8 @@ class AutomationClient(object):
     :vartype runbook: azure.mgmt.automation.operations.RunbookOperations
     :ivar test_job_streams: TestJobStreams operations
     :vartype test_job_streams: azure.mgmt.automation.operations.TestJobStreamsOperations
-    :ivar test_jobs: TestJobs operations
-    :vartype test_jobs: azure.mgmt.automation.operations.TestJobsOperations
+    :ivar test_job: TestJob operations
+    :vartype test_job: azure.mgmt.automation.operations.TestJobOperations
     :ivar schedule: Schedule operations
     :vartype schedule: azure.mgmt.automation.operations.ScheduleOperations
     :ivar variable: Variable operations
@@ -174,6 +173,10 @@ class AutomationClient(object):
     :vartype source_control: azure.mgmt.automation.operations.SourceControlOperations
     :ivar source_control_sync_job: SourceControlSyncJob operations
     :vartype source_control_sync_job: azure.mgmt.automation.operations.SourceControlSyncJobOperations
+    :ivar job: Job operations
+    :vartype job: azure.mgmt.automation.operations.JobOperations
+    :ivar job_stream: JobStream operations
+    :vartype job_stream: azure.mgmt.automation.operations.JobStreamOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -233,12 +236,10 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.hybrid_runbook_worker_group = HybridRunbookWorkerGroupOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.job = JobOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.job_stream = JobStreamOperations(
-            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(
@@ -253,7 +254,7 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.test_job_streams = TestJobStreamsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.test_jobs = TestJobsOperations(
+        self.test_job = TestJobOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.schedule = ScheduleOperations(
             self._client, self.config, self._serialize, self._deserialize)
@@ -271,3 +272,7 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.source_control_sync_job = SourceControlSyncJobOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.job = JobOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.job_stream = JobStreamOperations(
+            self._client, self.config, self._serialize, self._deserialize)
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py b/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py
index fe7b7521a4a5..fe36311fa244 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py
@@ -54,7 +54,7 @@
 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 .job_provisioning_state_property import JobProvisioningStateProperty
 from .dsc_compilation_job import DscCompilationJob
 from .dsc_configuration_create_or_update_parameters import DscConfigurationCreateOrUpdateParameters
 from .dsc_meta_configuration import DscMetaConfiguration
@@ -75,11 +75,13 @@
 from .runbook_association_property import RunbookAssociationProperty
 from .job import Job
 from .job_create_parameters import JobCreateParameters
+from .job_list_result import JobListResult
 from .schedule_association_property import ScheduleAssociationProperty
 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
@@ -121,6 +123,7 @@
 from .source_control_sync_job import SourceControlSyncJob
 from .source_control_sync_job_by_id_errors import SourceControlSyncJobByIdErrors
 from .source_control_sync_job_by_id import SourceControlSyncJobById
+from .job_collection_item import JobCollectionItem
 from .automation_account_paged import AutomationAccountPaged
 from .operation_paged import OperationPaged
 from .statistics_paged import StatisticsPaged
@@ -135,18 +138,18 @@
 from .dsc_node_report_paged import DscNodeReportPaged
 from .dsc_node_configuration_paged import DscNodeConfigurationPaged
 from .hybrid_runbook_worker_group_paged import HybridRunbookWorkerGroupPaged
-from .job_paged import JobPaged
-from .job_stream_paged import JobStreamPaged
 from .job_schedule_paged import JobSchedulePaged
 from .activity_paged import ActivityPaged
 from .module_paged import ModulePaged
 from .type_field_paged import TypeFieldPaged
 from .runbook_paged import RunbookPaged
+from .job_stream_paged import JobStreamPaged
 from .schedule_paged import SchedulePaged
 from .variable_paged import VariablePaged
 from .webhook_paged import WebhookPaged
 from .source_control_paged import SourceControlPaged
 from .source_control_sync_job_paged import SourceControlSyncJobPaged
+from .job_collection_item_paged import JobCollectionItemPaged
 from .automation_client_enums import (
     RunbookTypeEnum,
     RunbookState,
@@ -159,6 +162,7 @@
     AutomationAccountState,
     ScheduleDay,
     AgentRegistrationKeyName,
+    JobProvisioningState,
     JobStatus,
     JobStreamType,
     HttpStatusCode,
@@ -216,7 +220,7 @@
     'AgentRegistrationRegenerateKeyParameter',
     'DscConfigurationAssociationProperty',
     'DscCompilationJobCreateParameters',
-    'ProvisioningStateProperty',
+    'JobProvisioningStateProperty',
     'DscCompilationJob',
     'DscConfigurationCreateOrUpdateParameters',
     'DscMetaConfiguration',
@@ -237,11 +241,13 @@
     'RunbookAssociationProperty',
     'Job',
     'JobCreateParameters',
+    'JobListResult',
     'ScheduleAssociationProperty',
     'JobScheduleCreateParameters',
     'JobSchedule',
     'JobStream',
     'JobStreamListResult',
+    'LinkedWorkspace',
     'ModuleCreateOrUpdateParameters',
     'ModuleUpdateParameters',
     'ProxyResource',
@@ -283,6 +289,7 @@
     'SourceControlSyncJob',
     'SourceControlSyncJobByIdErrors',
     'SourceControlSyncJobById',
+    'JobCollectionItem',
     'AutomationAccountPaged',
     'OperationPaged',
     'StatisticsPaged',
@@ -297,18 +304,18 @@
     'DscNodeReportPaged',
     'DscNodeConfigurationPaged',
     'HybridRunbookWorkerGroupPaged',
-    'JobPaged',
-    'JobStreamPaged',
     'JobSchedulePaged',
     'ActivityPaged',
     'ModulePaged',
     'TypeFieldPaged',
     'RunbookPaged',
+    'JobStreamPaged',
     'SchedulePaged',
     'VariablePaged',
     'WebhookPaged',
     'SourceControlPaged',
     'SourceControlSyncJobPaged',
+    'JobCollectionItemPaged',
     'RunbookTypeEnum',
     'RunbookState',
     'RunbookProvisioningState',
@@ -320,6 +327,7 @@
     'AutomationAccountState',
     'ScheduleDay',
     'AgentRegistrationKeyName',
+    'JobProvisioningState',
     'JobStatus',
     'JobStreamType',
     'HttpStatusCode',
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/automation_client_enums.py b/azure-mgmt-automation/azure/mgmt/automation/models/automation_client_enums.py
index 5a07b5870fc5..983b88ecdc43 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/automation_client_enums.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/automation_client_enums.py
@@ -102,6 +102,14 @@ class AgentRegistrationKeyName(Enum):
     secondary = "secondary"
 
 
+class JobProvisioningState(Enum):
+
+    failed = "Failed"
+    succeeded = "Succeeded"
+    suspended = "Suspended"
+    processing = "Processing"
+
+
 class JobStatus(Enum):
 
     new = "New"
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_compilation_job.py b/azure-mgmt-automation/azure/mgmt/automation/models/dsc_compilation_job.py
index 2fb8659b176e..9a5bc91a0765 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_compilation_job.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/dsc_compilation_job.py
@@ -35,7 +35,7 @@ class DscCompilationJob(ProxyResource):
     :vartype creation_time: datetime
     :param provisioning_state: The current provisioning state of the job.
     :type provisioning_state:
-     ~azure.mgmt.automation.models.ProvisioningStateProperty
+     ~azure.mgmt.automation.models.JobProvisioningStateProperty
     :param run_on: Gets or sets the runOn which specifies the group name where
      the job is to be executed.
     :type run_on: str
@@ -83,7 +83,7 @@ class DscCompilationJob(ProxyResource):
         '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'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'JobProvisioningStateProperty'},
         'run_on': {'key': 'properties.runOn', 'type': 'str'},
         'status': {'key': 'properties.status', 'type': 'str'},
         'status_details': {'key': 'properties.statusDetails', 'type': 'str'},
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/job.py b/azure-mgmt-automation/azure/mgmt/automation/models/job.py
index 5433e56ea2c0..055809de13bc 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/job.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/job.py
@@ -9,14 +9,21 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .proxy_resource import ProxyResource
 
 
-class Job(Model):
+class Job(ProxyResource):
     """Definition of the job.
 
-    :param id: Gets or sets the id of the resource.
-    :type id: str
+    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 runbook: Gets or sets the runbook.
     :type runbook: ~azure.mgmt.automation.models.RunbookAssociationProperty
     :param started_by: Gets or sets the job started by.
@@ -48,10 +55,21 @@ class Job(Model):
     :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:
+     ~azure.mgmt.automation.models.JobProvisioningStateProperty
     """
 
+    _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'},
         'runbook': {'key': 'properties.runbook', 'type': 'RunbookAssociationProperty'},
         'started_by': {'key': 'properties.startedBy', 'type': 'str'},
         'run_on': {'key': 'properties.runOn', 'type': 'str'},
@@ -65,11 +83,11 @@ class Job(Model):
         'last_modified_time': {'key': 'properties.lastModifiedTime', 'type': 'iso-8601'},
         'last_status_modified_time': {'key': 'properties.lastStatusModifiedTime', 'type': 'iso-8601'},
         'parameters': {'key': 'properties.parameters', 'type': '{str}'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'JobProvisioningStateProperty'},
     }
 
-    def __init__(self, id=None, 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):
+    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):
         super(Job, self).__init__()
-        self.id = id
         self.runbook = runbook
         self.started_by = started_by
         self.run_on = run_on
@@ -83,3 +101,4 @@ def __init__(self, id=None, runbook=None, started_by=None, run_on=None, job_id=N
         self.last_modified_time = last_modified_time
         self.last_status_modified_time = last_status_modified_time
         self.parameters = parameters
+        self.provisioning_state = provisioning_state
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/job_collection_item.py b/azure-mgmt-automation/azure/mgmt/automation/models/job_collection_item.py
new file mode 100644
index 000000000000..4374b2f6732a
--- /dev/null
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/job_collection_item.py
@@ -0,0 +1,85 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .proxy_resource import ProxyResource
+
+
+class JobCollectionItem(ProxyResource):
+    """Job collection item properties.
+
+    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
+    :ivar runbook: The runbook association.
+    :vartype runbook: ~azure.mgmt.automation.models.RunbookAssociationProperty
+    :ivar job_id: The id of the job.
+    :vartype job_id: str
+    :ivar creation_time: The creation time of the job.
+    :vartype creation_time: datetime
+    :ivar status: The status of the job. Possible values include: 'New',
+     'Activating', 'Running', 'Completed', 'Failed', 'Stopped', 'Blocked',
+     'Suspended', 'Disconnected', 'Suspending', 'Stopping', 'Resuming',
+     'Removing'
+    :vartype status: str or ~azure.mgmt.automation.models.JobStatus
+    :ivar start_time: The start time of the job.
+    :vartype start_time: datetime
+    :ivar end_time: The end time of the job.
+    :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
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'runbook': {'readonly': True},
+        'job_id': {'readonly': True},
+        'creation_time': {'readonly': True},
+        'status': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+        'last_modified_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'runbook': {'key': 'properties.runbook', 'type': 'RunbookAssociationProperty'},
+        'job_id': {'key': 'properties.jobId', 'type': 'str'},
+        'creation_time': {'key': 'properties.creationTime', 'type': 'iso-8601'},
+        'status': {'key': 'properties.status', 'type': 'str'},
+        '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'},
+    }
+
+    def __init__(self, provisioning_state=None):
+        super(JobCollectionItem, self).__init__()
+        self.runbook = None
+        self.job_id = None
+        self.creation_time = None
+        self.status = None
+        self.start_time = None
+        self.end_time = None
+        self.last_modified_time = None
+        self.provisioning_state = provisioning_state
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/job_paged.py b/azure-mgmt-automation/azure/mgmt/automation/models/job_collection_item_paged.py
similarity index 67%
rename from azure-mgmt-automation/azure/mgmt/automation/models/job_paged.py
rename to azure-mgmt-automation/azure/mgmt/automation/models/job_collection_item_paged.py
index 9e9730212179..caa9d0b73f80 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/job_paged.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/job_collection_item_paged.py
@@ -12,16 +12,16 @@
 from msrest.paging import Paged
 
 
-class JobPaged(Paged):
+class JobCollectionItemPaged(Paged):
     """
-    A paging container for iterating over a list of :class:`Job <azure.mgmt.automation.models.Job>` object
+    A paging container for iterating over a list of :class:`JobCollectionItem <azure.mgmt.automation.models.JobCollectionItem>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[Job]'}
+        'current_page': {'key': 'value', 'type': '[JobCollectionItem]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(JobPaged, self).__init__(*args, **kwargs)
+        super(JobCollectionItemPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/job_create_parameters.py b/azure-mgmt-automation/azure/mgmt/automation/models/job_create_parameters.py
index 52879fee68ab..0af43145f55c 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/job_create_parameters.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/job_create_parameters.py
@@ -22,12 +22,6 @@ class JobCreateParameters(Model):
     :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 name: Gets or sets name of the resource.
-    :type name: str
-    :param location: Gets or sets the location of the resource.
-    :type location: str
-    :param tags: Gets or sets the tags attached to the resource.
-    :type tags: dict[str, str]
     """
 
     _validation = {
@@ -38,16 +32,10 @@ class JobCreateParameters(Model):
         'runbook': {'key': 'properties.runbook', 'type': 'RunbookAssociationProperty'},
         'parameters': {'key': 'properties.parameters', 'type': '{str}'},
         'run_on': {'key': 'properties.runOn', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-        'tags': {'key': 'tags', 'type': '{str}'},
     }
 
-    def __init__(self, runbook, parameters=None, run_on=None, name=None, location=None, tags=None):
+    def __init__(self, runbook, parameters=None, run_on=None):
         super(JobCreateParameters, self).__init__()
         self.runbook = runbook
         self.parameters = parameters
         self.run_on = run_on
-        self.name = name
-        self.location = location
-        self.tags = tags
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/job_list_result.py b/azure-mgmt-automation/azure/mgmt/automation/models/job_list_result.py
new file mode 100644
index 000000000000..d7421c478d72
--- /dev/null
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/job_list_result.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class JobListResult(Model):
+    """The response model for the list job operation.
+
+    :param value: Gets or sets a list of jobs.
+    :type value: list[~azure.mgmt.automation.models.Job]
+    :param next_link: Gets or sets the next link.
+    :type next_link: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[Job]'},
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+    }
+
+    def __init__(self, value=None, next_link=None):
+        super(JobListResult, self).__init__()
+        self.value = value
+        self.next_link = next_link
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/provisioning_state_property.py b/azure-mgmt-automation/azure/mgmt/automation/models/job_provisioning_state_property.py
similarity index 77%
rename from azure-mgmt-automation/azure/mgmt/automation/models/provisioning_state_property.py
rename to azure-mgmt-automation/azure/mgmt/automation/models/job_provisioning_state_property.py
index 6f747c4a3649..4822ea41b900 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/provisioning_state_property.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/job_provisioning_state_property.py
@@ -12,14 +12,16 @@
 from msrest.serialization import Model
 
 
-class ProvisioningStateProperty(Model):
+class JobProvisioningStateProperty(Model):
     """The provisioning state property.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar provisioning_state: The provisioning state of the resource.
-    :vartype provisioning_state: str
+    :ivar provisioning_state: The provisioning state of the resource. Possible
+     values include: 'Failed', 'Succeeded', 'Suspended', 'Processing'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.automation.models.JobProvisioningState
     """
 
     _validation = {
@@ -31,5 +33,5 @@ class ProvisioningStateProperty(Model):
     }
 
     def __init__(self):
-        super(ProvisioningStateProperty, self).__init__()
+        super(JobProvisioningStateProperty, self).__init__()
         self.provisioning_state = None
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/linked_workspace.py b/azure-mgmt-automation/azure/mgmt/automation/models/linked_workspace.py
new file mode 100644
index 000000000000..19010a7e1faa
--- /dev/null
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/linked_workspace.py
@@ -0,0 +1,35 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class LinkedWorkspace(Model):
+    """Definition of the linked workspace.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Gets the id of the linked workspace.
+    :vartype id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self):
+        super(LinkedWorkspace, self).__init__()
+        self.id = None
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/test_job.py b/azure-mgmt-automation/azure/mgmt/automation/models/test_job.py
index c54ca980cbf7..7ef32100a04f 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/test_job.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/test_job.py
@@ -38,6 +38,9 @@ class TestJob(Model):
     :type last_status_modified_time: datetime
     :param parameters: Gets or sets the parameters of the test job.
     :type parameters: dict[str, str]
+    :param log_activity_trace: The activity-level tracing options of the
+     runbook.
+    :type log_activity_trace: int
     """
 
     _attribute_map = {
@@ -51,9 +54,10 @@ class TestJob(Model):
         'last_modified_time': {'key': 'lastModifiedTime', 'type': 'iso-8601'},
         'last_status_modified_time': {'key': 'lastStatusModifiedTime', 'type': 'iso-8601'},
         'parameters': {'key': 'parameters', 'type': '{str}'},
+        'log_activity_trace': {'key': 'logActivityTrace', 'type': 'int'},
     }
 
-    def __init__(self, creation_time=None, status=None, status_details=None, run_on=None, start_time=None, end_time=None, exception=None, last_modified_time=None, last_status_modified_time=None, parameters=None):
+    def __init__(self, creation_time=None, status=None, status_details=None, run_on=None, start_time=None, end_time=None, exception=None, last_modified_time=None, last_status_modified_time=None, parameters=None, log_activity_trace=None):
         super(TestJob, self).__init__()
         self.creation_time = creation_time
         self.status = status
@@ -65,3 +69,4 @@ def __init__(self, creation_time=None, status=None, status_details=None, run_on=
         self.last_modified_time = last_modified_time
         self.last_status_modified_time = last_status_modified_time
         self.parameters = parameters
+        self.log_activity_trace = log_activity_trace
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/test_job_create_parameters.py b/azure-mgmt-automation/azure/mgmt/automation/models/test_job_create_parameters.py
index d614c236de9d..36ad6ef98849 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/test_job_create_parameters.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/test_job_create_parameters.py
@@ -15,8 +15,6 @@
 class TestJobCreateParameters(Model):
     """The parameters supplied to the create test job operation.
 
-    :param runbook_name: Gets or sets the runbook name.
-    :type runbook_name: str
     :param parameters: Gets or sets the parameters of the test job.
     :type parameters: dict[str, str]
     :param run_on: Gets or sets the runOn which specifies the group name where
@@ -24,18 +22,12 @@ class TestJobCreateParameters(Model):
     :type run_on: str
     """
 
-    _validation = {
-        'runbook_name': {'required': True},
-    }
-
     _attribute_map = {
-        'runbook_name': {'key': 'runbookName', 'type': 'str'},
         'parameters': {'key': 'parameters', 'type': '{str}'},
         'run_on': {'key': 'runOn', 'type': 'str'},
     }
 
-    def __init__(self, runbook_name, parameters=None, run_on=None):
+    def __init__(self, parameters=None, run_on=None):
         super(TestJobCreateParameters, self).__init__()
-        self.runbook_name = runbook_name
         self.parameters = parameters
         self.run_on = run_on
diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/webhook_update_parameters.py b/azure-mgmt-automation/azure/mgmt/automation/models/webhook_update_parameters.py
index 9c21a61110c0..b3b5fc235c10 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/models/webhook_update_parameters.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/models/webhook_update_parameters.py
@@ -28,10 +28,6 @@ class WebhookUpdateParameters(Model):
     :type description: str
     """
 
-    _validation = {
-        'name': {'required': True},
-    }
-
     _attribute_map = {
         'name': {'key': 'name', 'type': 'str'},
         'is_enabled': {'key': 'properties.isEnabled', 'type': 'bool'},
@@ -40,7 +36,7 @@ class WebhookUpdateParameters(Model):
         'description': {'key': 'properties.description', 'type': 'str'},
     }
 
-    def __init__(self, name, is_enabled=None, run_on=None, parameters=None, description=None):
+    def __init__(self, name=None, is_enabled=None, run_on=None, parameters=None, description=None):
         super(WebhookUpdateParameters, self).__init__()
         self.name = name
         self.is_enabled = is_enabled
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/__init__.py b/azure-mgmt-automation/azure/mgmt/automation/operations/__init__.py
index 3255b5163032..f9c45f0c7e36 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/__init__.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/__init__.py
@@ -25,9 +25,8 @@
 from .node_reports_operations import NodeReportsOperations
 from .dsc_node_configuration_operations import DscNodeConfigurationOperations
 from .hybrid_runbook_worker_group_operations import HybridRunbookWorkerGroupOperations
-from .job_operations import JobOperations
-from .job_stream_operations import JobStreamOperations
 from .job_schedule_operations import JobScheduleOperations
+from .linked_workspace_operations import LinkedWorkspaceOperations
 from .activity_operations import ActivityOperations
 from .module_operations import ModuleOperations
 from .object_data_types_operations import ObjectDataTypesOperations
@@ -35,7 +34,7 @@
 from .runbook_draft_operations import RunbookDraftOperations
 from .runbook_operations import RunbookOperations
 from .test_job_streams_operations import TestJobStreamsOperations
-from .test_jobs_operations import TestJobsOperations
+from .test_job_operations import TestJobOperations
 from .schedule_operations import ScheduleOperations
 from .variable_operations import VariableOperations
 from .webhook_operations import WebhookOperations
@@ -44,6 +43,8 @@
 from .software_update_configuration_machine_runs_operations import SoftwareUpdateConfigurationMachineRunsOperations
 from .source_control_operations import SourceControlOperations
 from .source_control_sync_job_operations import SourceControlSyncJobOperations
+from .job_operations import JobOperations
+from .job_stream_operations import JobStreamOperations
 
 __all__ = [
     'AutomationAccountOperations',
@@ -62,9 +63,8 @@
     'NodeReportsOperations',
     'DscNodeConfigurationOperations',
     'HybridRunbookWorkerGroupOperations',
-    'JobOperations',
-    'JobStreamOperations',
     'JobScheduleOperations',
+    'LinkedWorkspaceOperations',
     'ActivityOperations',
     'ModuleOperations',
     'ObjectDataTypesOperations',
@@ -72,7 +72,7 @@
     'RunbookDraftOperations',
     'RunbookOperations',
     'TestJobStreamsOperations',
-    'TestJobsOperations',
+    'TestJobOperations',
     'ScheduleOperations',
     'VariableOperations',
     'WebhookOperations',
@@ -81,4 +81,6 @@
     'SoftwareUpdateConfigurationMachineRunsOperations',
     'SourceControlOperations',
     'SourceControlSyncJobOperations',
+    'JobOperations',
+    'JobStreamOperations',
 ]
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py
index 9cc4f6c89b08..3e7d55743fd2 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py
@@ -59,7 +59,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/activities/{activityName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -100,6 +100,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/activities/{activityName}'}
 
     def list_by_module(
             self, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config):
@@ -124,7 +125,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/activities'
+                url = self.list_by_module.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -170,3 +171,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_module.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/activities'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py
index 8c595a76dace..f70c99cbce37 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py
@@ -54,7 +54,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/agentRegistrationInformation'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -93,6 +93,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/agentRegistrationInformation'}
 
     def regenerate_key(
             self, automation_account_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -116,7 +117,7 @@ def regenerate_key(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/agentRegistrationInformation/regenerateKey'
+        url = self.regenerate_key.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -159,3 +160,4 @@ def regenerate_key(
             return client_raw_response
 
         return deserialized
+    regenerate_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/agentRegistrationInformation/regenerateKey'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/automation_account_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/automation_account_operations.py
index 0dc8a3315444..242ab5e56e2d 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/automation_account_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/automation_account_operations.py
@@ -60,7 +60,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -103,6 +103,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'}
 
     def create_or_update(
             self, resource_group_name, automation_account_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -129,7 +130,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -174,6 +175,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'}
 
     def delete(
             self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -194,7 +196,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -226,6 +228,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'}
 
     def get(
             self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -247,7 +250,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -286,6 +289,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}'}
 
     def list_by_resource_group(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
@@ -308,7 +312,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts'
+                url = self.list_by_resource_group.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
@@ -352,6 +356,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts'}
 
     def list(
             self, custom_headers=None, raw=False, **operation_config):
@@ -374,7 +379,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/providers/Microsoft.Automation/automationAccounts'
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
@@ -417,3 +422,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Automation/automationAccounts'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py
index e4bae4551e41..aa4e283d394a 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py
@@ -55,7 +55,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -88,6 +88,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'}
 
     def get(
             self, automation_account_name, certificate_name, custom_headers=None, raw=False, **operation_config):
@@ -109,7 +110,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -149,6 +150,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'}
 
     def create_or_update(
             self, automation_account_name, certificate_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -175,7 +177,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -221,6 +223,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'}
 
     def update(
             self, automation_account_name, certificate_name, name=None, description=None, custom_headers=None, raw=False, **operation_config):
@@ -249,7 +252,7 @@ def update(
         parameters = models.CertificateUpdateParameters(name=name, description=description)
 
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -293,6 +296,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -315,7 +319,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -360,3 +364,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py
index d9f9828ff0b3..c10b544a8ca0 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py
@@ -56,7 +56,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -96,6 +96,7 @@ def delete(
             return client_raw_response
 
         return deserialized
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'}
 
     def get(
             self, automation_account_name, connection_name, custom_headers=None, raw=False, **operation_config):
@@ -117,7 +118,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -157,6 +158,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'}
 
     def create_or_update(
             self, automation_account_name, connection_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -183,7 +185,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -229,6 +231,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'}
 
     def update(
             self, automation_account_name, connection_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -255,7 +258,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -299,6 +302,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -321,7 +325,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -366,3 +370,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py
index 1a363ec77d52..06894f10ed2b 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py
@@ -55,7 +55,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -88,6 +88,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'}
 
     def get(
             self, automation_account_name, connection_type_name, custom_headers=None, raw=False, **operation_config):
@@ -109,7 +110,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -149,6 +150,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'}
 
     def create_or_update(
             self, automation_account_name, connection_type_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -175,7 +177,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -221,6 +223,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -243,7 +246,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -288,3 +291,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py
index 529818d10e93..2f7192c9dcd3 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py
@@ -56,7 +56,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -89,6 +89,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'}
 
     def get(
             self, automation_account_name, credential_name, custom_headers=None, raw=False, **operation_config):
@@ -110,7 +111,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -150,6 +151,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'}
 
     def create_or_update(
             self, automation_account_name, credential_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -176,7 +178,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -222,6 +224,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'}
 
     def update(
             self, automation_account_name, credential_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -248,7 +251,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -292,6 +295,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -313,7 +317,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -360,3 +364,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py
index 05a5ec3cdbec..0c072f0dca64 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py
@@ -60,7 +60,7 @@ def create(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{compilationJobId}'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -104,6 +104,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{compilationJobId}'}
 
     def get(
             self, automation_account_name, compilation_job_id, custom_headers=None, raw=False, **operation_config):
@@ -125,7 +126,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{compilationJobId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -165,6 +166,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{compilationJobId}'}
 
     def list_by_automation_account(
             self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -189,7 +191,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -236,6 +238,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs'}
 
     def get_stream(
             self, automation_account_name, job_id, job_stream_id, custom_headers=None, raw=False, **operation_config):
@@ -259,7 +262,7 @@ def get_stream(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{jobId}/streams/{jobStreamId}'
+        url = self.get_stream.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -300,3 +303,4 @@ def get_stream(
             return client_raw_response
 
         return deserialized
+    get_stream.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{jobId}/streams/{jobStreamId}'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py
index d16fd28c98ea..6c15fc10dbe4 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py
@@ -56,7 +56,7 @@ def list_by_job(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{jobId}/streams/'
+        url = self.list_by_job.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -96,3 +96,4 @@ def list_by_job(
             return client_raw_response
 
         return deserialized
+    list_by_job.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{jobId}/streams/'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py
index 0835e3c828f2..16c68f60b46e 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py
@@ -55,7 +55,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -88,6 +88,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'}
 
     def get(
             self, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config):
@@ -109,7 +110,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -149,6 +150,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'}
 
     def create_or_update(
             self, automation_account_name, configuration_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -174,7 +176,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -220,6 +222,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'}
 
     def get_content(
             self, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config):
@@ -240,7 +243,7 @@ def get_content(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}/content'
+        url = self.get_content.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -280,6 +283,7 @@ def get_content(
             return client_raw_response
 
         return deserialized
+    get_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}/content'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -302,7 +306,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -347,3 +351,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py
index 76c1080f939c..c48fa9d692e8 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py
@@ -55,7 +55,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -88,6 +88,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'}
 
     def get(
             self, automation_account_name, node_configuration_name, custom_headers=None, raw=False, **operation_config):
@@ -109,7 +110,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -149,6 +150,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'}
 
     def create_or_update(
             self, automation_account_name, node_configuration_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -174,7 +176,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -218,6 +220,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'}
 
     def list_by_automation_account(
             self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -242,7 +245,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -289,3 +292,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py
index 9cf7b100b071..c12b1d3a0006 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py
@@ -56,7 +56,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -96,6 +96,7 @@ def delete(
             return client_raw_response
 
         return deserialized
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'}
 
     def get(
             self, automation_account_name, node_id, custom_headers=None, raw=False, **operation_config):
@@ -117,7 +118,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -157,6 +158,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'}
 
     def update(
             self, automation_account_name, node_id, node_id1=None, node_configuration=None, custom_headers=None, raw=False, **operation_config):
@@ -185,7 +187,7 @@ def update(
         parameters = models.DscNodeUpdateParameters(node_configuration=node_configuration)
 
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -229,6 +231,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'}
 
     def list_by_automation_account(
             self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -253,7 +256,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -300,3 +303,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py
index ca9ef2a165e7..3d0245394b74 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py
@@ -61,7 +61,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/types/{typeName}/fields'
+                url = self.list_by_type.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -108,3 +108,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_type.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/types/{typeName}/fields'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py
index b59bb3612f61..b07d8d770401 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py
@@ -56,7 +56,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -89,6 +89,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'}
 
     def get(
             self, automation_account_name, hybrid_runbook_worker_group_name, custom_headers=None, raw=False, **operation_config):
@@ -111,7 +112,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -151,6 +152,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'}
 
     def update(
             self, automation_account_name, hybrid_runbook_worker_group_name, credential=None, custom_headers=None, raw=False, **operation_config):
@@ -178,7 +180,7 @@ def update(
         parameters = models.HybridRunbookWorkerGroupUpdateParameters(credential=credential)
 
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -222,6 +224,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -244,7 +247,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -289,3 +292,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py
index aea654ca87dc..55947bc866b6 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py
@@ -11,6 +11,7 @@
 
 import uuid
 from msrest.pipeline import ClientRawResponse
+from msrestazure.azure_exceptions import CloudError
 
 from .. import models
 
@@ -22,7 +23,7 @@ class JobOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Constant value: "2015-10-31".
+    :ivar api_version: Client Api Version. Constant value: "2017-05-15-preview".
     """
 
     models = models
@@ -32,40 +33,32 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2015-10-31"
+        self.api_version = "2017-05-15-preview"
 
         self.config = config
 
     def get_output(
-            self, automation_account_name, job_id, custom_headers=None, raw=False, callback=None, **operation_config):
-        """Retrieve the job output identified by job id.
+            self, job_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieve the job output identified by job name.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The name of the job to be created.
+        :type job_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
-        :param callback: When specified, will be called with each chunk of
-         data that is streamed. The callback should take two arguments, the
-         bytes of the current chunk of data and the response object. If the
-         data is uploading, response will be None.
-        :type callback: Callable[Bytes, response=None]
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: object or ClientRawResponse if raw=true
-        :rtype: Generator or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
+        :return: str or ClientRawResponse if raw=true
+        :rtype: str or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}/output'
+        url = self.get_output.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -80,57 +73,54 @@ def get_output(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
         request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=True, **operation_config)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
         if response.status_code not in [200]:
-            raise models.ErrorResponseException(self._deserialize, response)
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
 
         deserialized = None
 
         if response.status_code == 200:
-            deserialized = self._client.stream_download(response, callback)
+            deserialized = self._deserialize('str', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
         return deserialized
+    get_output.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/output'}
 
     def get_runbook_content(
-            self, automation_account_name, job_id, custom_headers=None, raw=False, callback=None, **operation_config):
-        """Retrieve the runbook content of the job identified by job id.
+            self, job_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieve the runbook content of the job identified by job name.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
-        :param callback: When specified, will be called with each chunk of
-         data that is streamed. The callback should take two arguments, the
-         bytes of the current chunk of data and the response object. If the
-         data is uploading, response will be None.
-        :type callback: Callable[Bytes, response=None]
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: object or ClientRawResponse if raw=true
-        :rtype: Generator or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
+        :return: str or ClientRawResponse if raw=true
+        :rtype: str or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}/runbookContent'
+        url = self.get_runbook_content.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -145,35 +135,38 @@ def get_runbook_content(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
         request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=True, **operation_config)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
         if response.status_code not in [200]:
-            raise models.ErrorResponseException(self._deserialize, response)
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
 
         deserialized = None
 
         if response.status_code == 200:
-            deserialized = self._client.stream_download(response, callback)
+            deserialized = self._deserialize('str', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
         return deserialized
+    get_runbook_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/runbookContent'}
 
     def suspend(
-            self, automation_account_name, job_id, custom_headers=None, raw=False, **operation_config):
-        """Suspend the job identified by jobId.
+            self, job_name, custom_headers=None, raw=False, **operation_config):
+        """Suspend the job identified by job name.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -185,12 +178,12 @@ def suspend(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}/suspend'
+        url = self.suspend.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -205,6 +198,8 @@ def suspend(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -218,15 +213,14 @@ def suspend(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    suspend.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/suspend'}
 
     def stop(
-            self, automation_account_name, job_id, custom_headers=None, raw=False, **operation_config):
-        """Stop the job identified by jobId.
+            self, job_name, custom_headers=None, raw=False, **operation_config):
+        """Stop the job identified by jobName.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -238,11 +232,11 @@ def stop(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}/stop'
+        url = self.stop.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -258,6 +252,8 @@ def stop(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -271,15 +267,14 @@ def stop(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    stop.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/stop'}
 
     def get(
-            self, automation_account_name, job_id, custom_headers=None, raw=False, **operation_config):
-        """Retrieve the job identified by job id.
+            self, job_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieve the job identified by job name.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -292,12 +287,12 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -312,6 +307,8 @@ def get(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -332,15 +329,14 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}'}
 
     def create(
-            self, automation_account_name, job_id, parameters, custom_headers=None, raw=False, **operation_config):
+            self, job_name, parameters, custom_headers=None, raw=False, **operation_config):
         """Create a job of the runbook.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param parameters: The parameters supplied to the create job
          operation.
         :type parameters: ~azure.mgmt.automation.models.JobCreateParameters
@@ -356,12 +352,12 @@ def create(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}'
+        url = self.create.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -376,6 +372,8 @@ def create(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -400,13 +398,12 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}'}
 
     def list_by_automation_account(
-            self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config):
+            self, filter=None, custom_headers=None, raw=False, **operation_config):
         """Retrieve a list of jobs.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
         :param filter: The filter to apply on the operation.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
@@ -414,9 +411,9 @@ def list_by_automation_account(
          deserialized response
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of Job
+        :return: An iterator like instance of JobCollectionItem
         :rtype:
-         ~azure.mgmt.automation.models.JobPaged[~azure.mgmt.automation.models.Job]
+         ~azure.mgmt.automation.models.JobCollectionItemPaged[~azure.mgmt.automation.models.JobCollectionItem]
         :raises:
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
@@ -424,10 +421,10 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-                    'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
+                    'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
@@ -449,6 +446,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
                 header_parameters.update(custom_headers)
+            if self.config.client_request_id is not None:
+                header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
             if self.config.accept_language is not None:
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -463,23 +462,22 @@ def internal_paging(next_link=None, raw=False):
             return response
 
         # Deserialize response
-        deserialized = models.JobPaged(internal_paging, self._deserialize.dependencies)
+        deserialized = models.JobCollectionItemPaged(internal_paging, self._deserialize.dependencies)
 
         if raw:
             header_dict = {}
-            client_raw_response = models.JobPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            client_raw_response = models.JobCollectionItemPaged(internal_paging, self._deserialize.dependencies, header_dict)
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs'}
 
     def resume(
-            self, automation_account_name, job_id, custom_headers=None, raw=False, **operation_config):
-        """Resume the job identified by jobId.
+            self, job_name, custom_headers=None, raw=False, **operation_config):
+        """Resume the job identified by jobName.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -491,11 +489,11 @@ def resume(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}/resume'
+        url = self.resume.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -511,6 +509,8 @@ def resume(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -524,3 +524,4 @@ def resume(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    resume.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/resume'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py
index 4a1be6fc2940..5a5ea3075277 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py
@@ -55,7 +55,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -88,6 +88,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'}
 
     def get(
             self, automation_account_name, job_schedule_id, custom_headers=None, raw=False, **operation_config):
@@ -109,7 +110,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -149,6 +150,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'}
 
     def create(
             self, automation_account_name, job_schedule_id, parameters, custom_headers=None, raw=False, **operation_config):
@@ -174,7 +176,7 @@ def create(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -218,6 +220,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -240,7 +243,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -285,3 +288,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py
index 08c3b111bbc5..66664c8175f9 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py
@@ -22,7 +22,7 @@ class JobStreamOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Constant value: "2015-10-31".
+    :ivar api_version: Client Api Version. Constant value: "2017-05-15-preview".
     """
 
     models = models
@@ -32,18 +32,16 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2015-10-31"
+        self.api_version = "2017-05-15-preview"
 
         self.config = config
 
     def get(
-            self, automation_account_name, job_id, job_stream_id, custom_headers=None, raw=False, **operation_config):
+            self, job_name, job_stream_id, custom_headers=None, raw=False, **operation_config):
         """Retrieve the job stream identified by job stream id.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param job_stream_id: The job stream id.
         :type job_stream_id: str
         :param dict custom_headers: headers that will be added to the request
@@ -58,13 +56,13 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}/streams/{jobStreamId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'jobId': self._serialize.url("job_id", job_id, 'str'),
-            'jobStreamId': self._serialize.url("job_stream_id", job_stream_id, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+            'jobName': self._serialize.url("job_name", job_name, 'str'),
+            'jobStreamId': self._serialize.url("job_stream_id", job_stream_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -79,6 +77,8 @@ def get(
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
             header_parameters.update(custom_headers)
+        if self.config.client_request_id is not None:
+            header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
         if self.config.accept_language is not None:
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -99,15 +99,14 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/streams/{jobStreamId}'}
 
     def list_by_job(
-            self, automation_account_name, job_id, filter=None, custom_headers=None, raw=False, **operation_config):
-        """Retrieve a list of jobs streams identified by job id.
+            self, job_name, filter=None, custom_headers=None, raw=False, **operation_config):
+        """Retrieve a list of jobs streams identified by job name.
 
-        :param automation_account_name: The automation account name.
-        :type automation_account_name: str
-        :param job_id: The job Id.
-        :type job_id: str
+        :param job_name: The job name.
+        :type job_name: str
         :param filter: The filter to apply on the operation.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
@@ -125,11 +124,11 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobId}/streams'
+                url = self.list_by_job.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-                    'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-                    'jobId': self._serialize.url("job_id", job_id, 'str'),
+                    'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'),
+                    'jobName': self._serialize.url("job_name", job_name, 'str'),
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
@@ -151,6 +150,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
                 header_parameters.update(custom_headers)
+            if self.config.client_request_id is not None:
+                header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str')
             if self.config.accept_language is not None:
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
@@ -173,3 +174,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_job.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/streams'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/linked_workspace_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/linked_workspace_operations.py
new file mode 100644
index 000000000000..2c233ec6c506
--- /dev/null
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/linked_workspace_operations.py
@@ -0,0 +1,96 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+import uuid
+from msrest.pipeline import ClientRawResponse
+
+from .. import models
+
+
+class LinkedWorkspaceOperations(object):
+    """LinkedWorkspaceOperations operations.
+
+    :param client: Client for service requests.
+    :param config: Configuration of service client.
+    :param serializer: An object model serializer.
+    :param deserializer: An object model deserializer.
+    :ivar api_version: Client Api Version. Constant value: "2015-10-31".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2015-10-31"
+
+        self.config = config
+
+    def get(
+            self, automation_account_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieve the linked workspace for the account id.
+
+        :param automation_account_name: The automation account name.
+        :type automation_account_name: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: LinkedWorkspace or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.automation.models.LinkedWorkspace or
+         ~msrest.pipeline.ClientRawResponse
+        :raises:
+         :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
+            'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorResponseException(self._deserialize, response)
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('LinkedWorkspace', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/linkedWorkspace'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py
index ffa2976ecc0c..b6f9eb93acf6 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py
@@ -55,7 +55,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -88,6 +88,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'}
 
     def get(
             self, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config):
@@ -109,7 +110,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -149,6 +150,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'}
 
     def create_or_update(
             self, automation_account_name, module_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -173,7 +175,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -219,6 +221,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'}
 
     def update(
             self, automation_account_name, module_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -242,7 +245,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -286,6 +289,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -308,7 +312,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -353,3 +357,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py
index 800e495a6c80..e347ea723baa 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py
@@ -61,7 +61,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports'
+                url = self.list_by_node.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -109,6 +109,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_node.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports'}
 
     def get(
             self, automation_account_name, node_id, report_id, custom_headers=None, raw=False, **operation_config):
@@ -132,7 +133,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports/{reportId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -173,6 +174,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports/{reportId}'}
 
     def get_content(
             self, automation_account_name, node_id, report_id, custom_headers=None, raw=False, **operation_config):
@@ -195,7 +197,7 @@ def get_content(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports/{reportId}/content'
+        url = self.get_content.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -236,3 +238,4 @@ def get_content(
             return client_raw_response
 
         return deserialized
+    get_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports/{reportId}/content'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py
index 3591bc66153b..984982241cf0 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py
@@ -61,7 +61,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/objectDataTypes/{typeName}/fields'
+                url = self.list_fields_by_module_and_type.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -108,6 +108,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_fields_by_module_and_type.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/objectDataTypes/{typeName}/fields'}
 
     def list_fields_by_type(
             self, automation_account_name, type_name, custom_headers=None, raw=False, **operation_config):
@@ -133,7 +134,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/objectDataTypes/{typeName}/fields'
+                url = self.list_fields_by_type.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -179,3 +180,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_fields_by_type.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/objectDataTypes/{typeName}/fields'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/operations.py
index 999de4a3e5d4..104b10d28aad 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/operations.py
@@ -55,7 +55,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/providers/Microsoft.Automation/operations'
+                url = self.list.metadata['url']
 
                 # Construct parameters
                 query_parameters = {}
@@ -94,3 +94,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/providers/Microsoft.Automation/operations'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py
index fd13e37a1a42..9afe236c401b 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py
@@ -11,6 +11,7 @@
 
 import uuid
 from msrest.pipeline import ClientRawResponse
+from msrestazure.azure_exceptions import CloudError
 from msrest.exceptions import DeserializationError
 from msrestazure.azure_operation import AzureOperationPoller
 
@@ -39,7 +40,7 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def get_content(
-            self, automation_account_name, runbook_name, custom_headers=None, raw=False, callback=None, **operation_config):
+            self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
         """Retrieve the content of runbook draft identified by runbook name.
 
         :param automation_account_name: The automation account name.
@@ -49,25 +50,19 @@ def get_content(
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
-        :param callback: When specified, will be called with each chunk of
-         data that is streamed. The callback should take two arguments, the
-         bytes of the current chunk of data and the response object. If the
-         data is uploading, response will be None.
-        :type callback: Callable[Bytes, response=None]
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: object or ClientRawResponse if raw=true
-        :rtype: Generator or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
+        :return: str or ClientRawResponse if raw=true
+        :rtype: str or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/content'
+        url = self.get_content.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -87,32 +82,35 @@ def get_content(
 
         # Construct and send request
         request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=True, **operation_config)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
         if response.status_code not in [200]:
-            raise models.ErrorResponseException(self._deserialize, response)
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
 
         deserialized = None
 
         if response.status_code == 200:
-            deserialized = self._client.stream_download(response, callback)
+            deserialized = self._deserialize('str', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
         return deserialized
+    get_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/content'}
 
 
-    def _create_or_update_initial(
-            self, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, callback=None, **operation_config):
+    def _replace_content_initial(
+            self, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, **operation_config):
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/content'
+        url = self.replace_content.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -122,7 +120,7 @@ def _create_or_update_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Content-Type'] = 'text/powershell'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -131,30 +129,34 @@ def _create_or_update_initial(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct body
-        body_content = upload_gen(runbook_content)
+        body_content = self._serialize.body(runbook_content, 'str')
 
         # Construct and send request
         request = self._client.put(url, query_parameters)
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 202]:
+        if response.status_code not in [202]:
             raise models.ErrorResponseException(self._deserialize, response)
 
         if raw:
             client_raw_response = ClientRawResponse(None, response)
+            header_dict = {
+                'location': 'str',
+            }
+            client_raw_response.add_headers(header_dict)
             return client_raw_response
 
-    def create_or_update(
-            self, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, callback=None, **operation_config):
-        """Updates the runbook draft with runbookStream as its content.
+    def replace_content(
+            self, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, **operation_config):
+        """Replaces the runbook draft content.
 
         :param automation_account_name: The automation account name.
         :type automation_account_name: str
         :param runbook_name: The runbook name.
         :type runbook_name: str
         :param runbook_content: The runbook draft content.
-        :type runbook_content: Generator
+        :type runbook_content: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -165,7 +167,7 @@ def create_or_update(
         :raises:
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
-        raw_result = self._create_or_update_initial(
+        raw_result = self._replace_content_initial(
             automation_account_name=automation_account_name,
             runbook_name=runbook_name,
             runbook_content=runbook_content,
@@ -192,11 +194,14 @@ def get_long_running_status(status_link, headers=None):
 
         def get_long_running_output(response):
 
-            if response.status_code not in [200, 202]:
+            if response.status_code not in [202]:
                 raise models.ErrorResponseException(self._deserialize, response)
 
             if raw:
                 client_raw_response = ClientRawResponse(None, response)
+                client_raw_response.add_headers({
+                    'location': 'str',
+                })
                 return client_raw_response
 
         long_running_operation_timeout = operation_config.get(
@@ -205,6 +210,7 @@ def get_long_running_output(response):
         return AzureOperationPoller(
             long_running_send, get_long_running_output,
             get_long_running_status, long_running_operation_timeout)
+    replace_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/content'}
 
     def get(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
@@ -226,12 +232,12 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft'
+        url = self.get.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -266,17 +272,18 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft'}
 
 
     def _publish_initial(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/publish'
+        url = self.publish.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -298,20 +305,17 @@ def _publish_initial(
         request = self._client.post(url, query_parameters)
         response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
-        if response.status_code not in [200, 202]:
+        if response.status_code not in [202]:
             raise models.ErrorResponseException(self._deserialize, response)
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('Runbook', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
+            header_dict = {
+                'location': 'str',
+            }
+            client_raw_response.add_headers(header_dict)
             return client_raw_response
 
-        return deserialized
-
     def publish(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
         """Publish runbook draft.
@@ -324,11 +328,10 @@ def publish(
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
-        :return: An instance of AzureOperationPoller that returns Runbook or
+        :return: An instance of AzureOperationPoller that returns None or
          ClientRawResponse if raw=true
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.automation.models.Runbook]
-         or ~msrest.pipeline.ClientRawResponse
+        :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or
+         ~msrest.pipeline.ClientRawResponse
         :raises:
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
@@ -358,27 +361,28 @@ def get_long_running_status(status_link, headers=None):
 
         def get_long_running_output(response):
 
-            if response.status_code not in [200, 202]:
+            if response.status_code not in [202]:
                 raise models.ErrorResponseException(self._deserialize, response)
 
-            deserialized = self._deserialize('Runbook', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
+                client_raw_response.add_headers({
+                    'location': 'str',
+                })
                 return client_raw_response
 
-            return deserialized
-
         long_running_operation_timeout = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
         return AzureOperationPoller(
             long_running_send, get_long_running_output,
             get_long_running_status, long_running_operation_timeout)
+    publish.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/publish'}
 
     def undo_edit(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
-        """Retrieve the runbook identified by runbook name.
+        """Undo draft edit to last known published state identified by runbook
+        name.
 
         :param automation_account_name: The automation account name.
         :type automation_account_name: str
@@ -396,12 +400,12 @@ def undo_edit(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/undoEdit'
+        url = self.undo_edit.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -436,3 +440,4 @@ def undo_edit(
             return client_raw_response
 
         return deserialized
+    undo_edit.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/undoEdit'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py
index 85bae54159a8..f30157e3fd5c 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py
@@ -11,6 +11,7 @@
 
 import uuid
 from msrest.pipeline import ClientRawResponse
+from msrestazure.azure_exceptions import CloudError
 
 from .. import models
 
@@ -37,7 +38,7 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def get_content(
-            self, automation_account_name, runbook_name, custom_headers=None, raw=False, callback=None, **operation_config):
+            self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
         """Retrieve the content of runbook identified by runbook name.
 
         :param automation_account_name: The automation account name.
@@ -47,25 +48,19 @@ def get_content(
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
-        :param callback: When specified, will be called with each chunk of
-         data that is streamed. The callback should take two arguments, the
-         bytes of the current chunk of data and the response object. If the
-         data is uploading, response will be None.
-        :type callback: Callable[Bytes, response=None]
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: object or ClientRawResponse if raw=true
-        :rtype: Generator or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
+        :return: str or ClientRawResponse if raw=true
+        :rtype: str or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/content'
+        url = self.get_content.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -85,21 +80,24 @@ def get_content(
 
         # Construct and send request
         request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=True, **operation_config)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
         if response.status_code not in [200]:
-            raise models.ErrorResponseException(self._deserialize, response)
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
 
         deserialized = None
 
         if response.status_code == 200:
-            deserialized = self._client.stream_download(response, callback)
+            deserialized = self._deserialize('str', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
         return deserialized
+    get_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/content'}
 
     def get(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
@@ -121,12 +119,12 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -161,6 +159,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'}
 
     def create_or_update(
             self, automation_account_name, runbook_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -180,18 +179,19 @@ def create_or_update(
          deserialized response
         :param operation_config: :ref:`Operation configuration
          overrides<msrest:optionsforoperations>`.
-        :return: None or ClientRawResponse if raw=true
-        :rtype: None or ~msrest.pipeline.ClientRawResponse
+        :return: Runbook or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.automation.models.Runbook or
+         ~msrest.pipeline.ClientRawResponse
         :raises:
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -220,10 +220,20 @@ def create_or_update(
         if response.status_code not in [200, 201, 400]:
             raise models.ErrorResponseException(self._deserialize, response)
 
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('Runbook', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Runbook', response)
+
         if raw:
-            client_raw_response = ClientRawResponse(None, response)
+            client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
+        return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'}
+
     def update(
             self, automation_account_name, runbook_name, parameters, custom_headers=None, raw=False, **operation_config):
         """Update the runbook identified by runbook name.
@@ -247,12 +257,12 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -291,6 +301,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'}
 
     def delete(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
@@ -311,12 +322,12 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -338,12 +349,13 @@ def delete(
         request = self._client.delete(url, query_parameters)
         response = self._client.send(request, header_parameters, stream=False, **operation_config)
 
-        if response.status_code not in [200]:
+        if response.status_code not in [200, 204]:
             raise models.ErrorResponseException(self._deserialize, response)
 
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -366,11 +378,11 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
-                    'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+                    'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
 
@@ -411,3 +423,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py
index 56c46fc330a9..d409cb133591 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py
@@ -60,7 +60,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -104,6 +104,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'}
 
     def update(
             self, automation_account_name, schedule_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -129,7 +130,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -173,6 +174,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'}
 
     def get(
             self, automation_account_name, schedule_name, custom_headers=None, raw=False, **operation_config):
@@ -194,7 +196,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -234,6 +236,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'}
 
     def delete(
             self, automation_account_name, schedule_name, custom_headers=None, raw=False, **operation_config):
@@ -254,7 +257,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -287,6 +290,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -309,7 +313,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -354,3 +358,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py
index 8bbade528da6..87daaf2e5ad3 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py
@@ -57,7 +57,7 @@ def get_by_id(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationMachineRuns/{softwareUpdateConfigurationMachineRunId}'
+        url = self.get_by_id.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -101,6 +101,7 @@ def get_by_id(
             return client_raw_response
 
         return deserialized
+    get_by_id.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationMachineRuns/{softwareUpdateConfigurationMachineRunId}'}
 
     def list(
             self, filter=None, skip=None, top=None, custom_headers=None, raw=False, **operation_config):
@@ -129,7 +130,7 @@ def list(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationMachineRuns'
+        url = self.list.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -178,3 +179,4 @@ def list(
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationMachineRuns'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py
index 56a61f15e0ff..21618c706b7e 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py
@@ -56,7 +56,7 @@ def get_by_id(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationRuns/{softwareUpdateConfigurationRunId}'
+        url = self.get_by_id.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -100,6 +100,7 @@ def get_by_id(
             return client_raw_response
 
         return deserialized
+    get_by_id.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationRuns/{softwareUpdateConfigurationRunId}'}
 
     def list(
             self, filter=None, skip=None, top=None, custom_headers=None, raw=False, **operation_config):
@@ -128,7 +129,7 @@ def list(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationRuns'
+        url = self.list.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -177,3 +178,4 @@ def list(
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationRuns'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py
index 0aeb2303e0a1..44246bc2b86a 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py
@@ -59,7 +59,7 @@ def create(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -109,6 +109,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'}
 
     def get_by_name(
             self, software_update_configuration_name, custom_headers=None, raw=False, **operation_config):
@@ -128,7 +129,7 @@ def get_by_name(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'
+        url = self.get_by_name.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -172,6 +173,7 @@ def get_by_name(
             return client_raw_response
 
         return deserialized
+    get_by_name.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'}
 
     def delete(
             self, software_update_configuration_name, custom_headers=None, raw=False, **operation_config):
@@ -190,7 +192,7 @@ def delete(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -227,6 +229,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'}
 
     def list(
             self, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -247,7 +250,7 @@ def list(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations'
+        url = self.list.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
@@ -292,3 +295,4 @@ def list(
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py
index b104c064b5b3..613bf904925b 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py
@@ -60,7 +60,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -106,6 +106,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'}
 
     def update(
             self, automation_account_name, source_control_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -131,7 +132,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -175,6 +176,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'}
 
     def delete(
             self, automation_account_name, source_control_name, custom_headers=None, raw=False, **operation_config):
@@ -195,7 +197,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -228,6 +230,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'}
 
     def get(
             self, automation_account_name, source_control_name, custom_headers=None, raw=False, **operation_config):
@@ -249,7 +252,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -289,6 +292,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'}
 
     def list_by_automation_account(
             self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -313,7 +317,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -360,3 +364,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py
index b347c43e0c12..db6a40acfdd8 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py
@@ -58,7 +58,7 @@ def create(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs/{sourceControlSyncJobId}'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -99,6 +99,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs/{sourceControlSyncJobId}'}
 
     def get(
             self, automation_account_name, source_control_name, source_control_sync_job_id, custom_headers=None, raw=False, **operation_config):
@@ -122,7 +123,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs/{sourceControlSyncJobId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -163,6 +164,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs/{sourceControlSyncJobId}'}
 
     def list_by_automation_account(
             self, automation_account_name, source_control_name, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -189,7 +191,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -237,3 +239,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/statistics_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/statistics_operations.py
index 81094dc051ae..987b078ada70 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/statistics_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/statistics_operations.py
@@ -61,7 +61,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/statistics'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -108,3 +108,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/statistics'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/test_jobs_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_operations.py
similarity index 86%
rename from azure-mgmt-automation/azure/mgmt/automation/operations/test_jobs_operations.py
rename to azure-mgmt-automation/azure/mgmt/automation/operations/test_job_operations.py
index f894dc21ba89..cabb25789a0b 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/test_jobs_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_operations.py
@@ -15,8 +15,8 @@
 from .. import models
 
 
-class TestJobsOperations(object):
-    """TestJobsOperations operations.
+class TestJobOperations(object):
+    """TestJobOperations operations.
 
     :param client: Client for service requests.
     :param config: Configuration of service client.
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def create(
-            self, automation_account_name, runbook_name, parameters, custom_headers=None, raw=False, **operation_config):
+            self, automation_account_name, runbook_name, parameters=None, run_on=None, custom_headers=None, raw=False, **operation_config):
         """Create a test job of the runbook.
 
         :param automation_account_name: The automation account name.
@@ -45,10 +45,11 @@ def create(
         :param runbook_name: The parameters supplied to the create test job
          operation.
         :type runbook_name: str
-        :param parameters: The parameters supplied to the create test job
-         operation.
-        :type parameters:
-         ~azure.mgmt.automation.models.TestJobCreateParameters
+        :param parameters: Gets or sets the parameters of the test job.
+        :type parameters: dict[str, str]
+        :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 dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -60,13 +61,15 @@ def create(
         :raises:
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
+        parameters1 = models.TestJobCreateParameters(parameters=parameters, run_on=run_on)
+
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob'
+        url = self.create.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -85,7 +88,7 @@ def create(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct body
-        body_content = self._serialize.body(parameters, 'TestJobCreateParameters')
+        body_content = self._serialize.body(parameters1, 'TestJobCreateParameters')
 
         # Construct and send request
         request = self._client.put(url, query_parameters)
@@ -105,6 +108,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob'}
 
     def get(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
@@ -126,12 +130,12 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob'
+        url = self.get.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -166,6 +170,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob'}
 
     def resume(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
@@ -186,12 +191,12 @@ def resume(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/resume'
+        url = self.resume.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -219,6 +224,7 @@ def resume(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    resume.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/resume'}
 
     def stop(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
@@ -239,12 +245,12 @@ def stop(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/stop'
+        url = self.stop.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -272,6 +278,7 @@ def stop(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    stop.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/stop'}
 
     def suspend(
             self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config):
@@ -292,12 +299,12 @@ def suspend(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/suspend'
+        url = self.suspend.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -325,3 +332,4 @@ def suspend(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    suspend.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/suspend'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py
index 47d89ac9a88f..665dccebcfe0 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py
@@ -38,7 +38,8 @@ def __init__(self, client, config, serializer, deserializer):
 
     def get(
             self, automation_account_name, runbook_name, job_stream_id, custom_headers=None, raw=False, **operation_config):
-        """Retrieve a test job streams identified by runbook name and stream id.
+        """Retrieve a test job stream of the test job identified by runbook name
+        and stream id.
 
         :param automation_account_name: The automation account name.
         :type automation_account_name: str
@@ -58,13 +59,13 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/streams/{jobStreamId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
             'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-            'jobStreamId': self._serialize.url("job_stream_id", job_stream_id, 'str'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+            'jobStreamId': self._serialize.url("job_stream_id", job_stream_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -99,6 +100,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/streams/{jobStreamId}'}
 
     def list_by_test_job(
             self, automation_account_name, runbook_name, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -125,12 +127,12 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/streams'
+                url = self.list_by_test_job.metadata['url']
                 path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
-                    'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'),
-                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+                    'runbookName': self._serialize.url("runbook_name", runbook_name, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
 
@@ -173,3 +175,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_test_job.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/streams'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/usages_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/usages_operations.py
index 983ce8d83099..f34570cc7bd9 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/usages_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/usages_operations.py
@@ -59,7 +59,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/usages'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -104,3 +104,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/usages'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py
index 57a69dc3e995..5eb4e317d9c8 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py
@@ -60,7 +60,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -106,6 +106,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'}
 
     def update(
             self, automation_account_name, variable_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -131,7 +132,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -175,6 +176,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'}
 
     def delete(
             self, automation_account_name, variable_name, custom_headers=None, raw=False, **operation_config):
@@ -195,7 +197,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -228,6 +230,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'}
 
     def get(
             self, automation_account_name, variable_name, custom_headers=None, raw=False, **operation_config):
@@ -249,7 +252,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -289,6 +292,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'}
 
     def list_by_automation_account(
             self, automation_account_name, custom_headers=None, raw=False, **operation_config):
@@ -311,7 +315,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -356,3 +360,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables'}
diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py
index 40aa05ee1af7..93e8a4241093 100644
--- a/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py
+++ b/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py
@@ -53,7 +53,7 @@ def generate_uri(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/generateUri'
+        url = self.generate_uri.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -92,6 +92,7 @@ def generate_uri(
             return client_raw_response
 
         return deserialized
+    generate_uri.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/generateUri'}
 
     def delete(
             self, automation_account_name, webhook_name, custom_headers=None, raw=False, **operation_config):
@@ -112,7 +113,7 @@ def delete(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -145,6 +146,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'}
 
     def get(
             self, automation_account_name, webhook_name, custom_headers=None, raw=False, **operation_config):
@@ -166,7 +168,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -206,6 +208,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'}
 
     def create_or_update(
             self, automation_account_name, webhook_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -230,7 +233,7 @@ def create_or_update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'
+        url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -276,6 +279,7 @@ def create_or_update(
             return client_raw_response
 
         return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'}
 
     def update(
             self, automation_account_name, webhook_name, parameters, custom_headers=None, raw=False, **operation_config):
@@ -300,7 +304,7 @@ def update(
          :class:`ErrorResponseException<azure.mgmt.automation.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
             'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -344,6 +348,7 @@ def update(
             return client_raw_response
 
         return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'}
 
     def list_by_automation_account(
             self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -368,7 +373,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks'
+                url = self.list_by_automation_account.metadata['url']
                 path_format_arguments = {
                     'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'),
                     'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'),
@@ -415,3 +420,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks'}