diff --git a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy.rb b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy.rb
index 6bb80210aa..63a3219984 100644
--- a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy.rb
+++ b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy.rb
@@ -20,8 +20,8 @@
 require 'ms_rest_azure'
 
 module Azure::ARM::Policy
-  autoload :PolicyAssignments,                                  'generated/azure_mgmt_policy/policy_assignments.rb'
   autoload :PolicyDefinitions,                                  'generated/azure_mgmt_policy/policy_definitions.rb'
+  autoload :PolicyAssignments,                                  'generated/azure_mgmt_policy/policy_assignments.rb'
   autoload :PolicyClient,                                       'generated/azure_mgmt_policy/policy_client.rb'
 
   module Models
@@ -30,5 +30,6 @@ module Models
     autoload :PolicyAssignmentListResult,                         'generated/azure_mgmt_policy/models/policy_assignment_list_result.rb'
     autoload :PolicyDefinitionListResult,                         'generated/azure_mgmt_policy/models/policy_definition_list_result.rb'
     autoload :PolicyType,                                         'generated/azure_mgmt_policy/models/policy_type.rb'
+    autoload :PolicyMode,                                         'generated/azure_mgmt_policy/models/policy_mode.rb'
   end
 end
diff --git a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_assignment.rb b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_assignment.rb
index 6da9f25513..518e5a1ead 100644
--- a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_assignment.rb
+++ b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_assignment.rb
@@ -6,7 +6,7 @@
 module Azure::ARM::Policy
   module Models
     #
-    # The policy definition.
+    # The policy assignment.
     #
     class PolicyAssignment
 
@@ -88,6 +88,7 @@ def self.mapper()
               },
               id: {
                 required: false,
+                read_only: true,
                 serialized_name: 'id',
                 type: {
                   name: 'String'
diff --git a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_definition.rb b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_definition.rb
index 22d02feec4..541a7e3a97 100644
--- a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_definition.rb
+++ b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_definition.rb
@@ -18,6 +18,11 @@ class PolicyDefinition
       # 'NotSpecified', 'BuiltIn', 'Custom'
       attr_accessor :policy_type
 
+      # @return [PolicyMode] The policy definition mode. Possible values are
+      # NotSpecified, Indexed, and All. Possible values include:
+      # 'NotSpecified', 'Indexed', 'All'
+      attr_accessor :mode
+
       # @return [String] The display name of the policy definition.
       attr_accessor :display_name
 
@@ -27,15 +32,16 @@ class PolicyDefinition
       # @return The policy rule.
       attr_accessor :policy_rule
 
+      # @return The policy definition metadata.
+      attr_accessor :metadata
+
       # @return Required if a parameter is used in policy rule.
       attr_accessor :parameters
 
       # @return [String] The ID of the policy definition.
       attr_accessor :id
 
-      # @return [String] The name of the policy definition. If you do not
-      # specify a value for name, the value is inferred from the name value in
-      # the request URI.
+      # @return [String] The name of the policy definition.
       attr_accessor :name
 
 
@@ -58,6 +64,13 @@ def self.mapper()
                   name: 'String'
                 }
               },
+              mode: {
+                required: false,
+                serialized_name: 'properties.mode',
+                type: {
+                  name: 'String'
+                }
+              },
               display_name: {
                 required: false,
                 serialized_name: 'properties.displayName',
@@ -79,6 +92,13 @@ def self.mapper()
                   name: 'Object'
                 }
               },
+              metadata: {
+                required: false,
+                serialized_name: 'properties.metadata',
+                type: {
+                  name: 'Object'
+                }
+              },
               parameters: {
                 required: false,
                 serialized_name: 'properties.parameters',
@@ -88,6 +108,7 @@ def self.mapper()
               },
               id: {
                 required: false,
+                read_only: true,
                 serialized_name: 'id',
                 type: {
                   name: 'String'
@@ -95,6 +116,7 @@ def self.mapper()
               },
               name: {
                 required: false,
+                read_only: true,
                 serialized_name: 'name',
                 type: {
                   name: 'String'
diff --git a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_mode.rb b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_mode.rb
new file mode 100644
index 0000000000..7ecd8e2689
--- /dev/null
+++ b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/models/policy_mode.rb
@@ -0,0 +1,17 @@
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator 1.2.2.0
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+
+module Azure::ARM::Policy
+  module Models
+    #
+    # Defines values for PolicyMode
+    #
+    module PolicyMode
+      NotSpecified = "NotSpecified"
+      Indexed = "Indexed"
+      All = "All"
+    end
+  end
+end
diff --git a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_assignments.rb b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_assignments.rb
index 1488134089..17168c96a3 100644
--- a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_assignments.rb
+++ b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_assignments.rb
@@ -75,7 +75,7 @@ def delete_async(scope, policy_assignment_name, custom_headers = nil)
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = '{scope}/providers/Microsoft.Authorization/policyassignments/{policyAssignmentName}'
+      path_template = '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'
 
       request_url = @base_url || @client.base_url
 
@@ -190,7 +190,7 @@ def create_async(scope, policy_assignment_name, parameters, custom_headers = nil
       request_content = @client.serialize(request_mapper,  parameters)
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '{scope}/providers/Microsoft.Authorization/policyassignments/{policyAssignmentName}'
+      path_template = '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'
 
       request_url = @base_url || @client.base_url
 
@@ -285,7 +285,7 @@ def get_async(scope, policy_assignment_name, custom_headers = nil)
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = '{scope}/providers/Microsoft.Authorization/policyassignments/{policyAssignmentName}'
+      path_template = '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'
 
       request_url = @base_url || @client.base_url
 
@@ -495,7 +495,7 @@ def list_for_resource_async(resource_group_name, resource_provider_namespace, pa
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/policyassignments'
+      path_template = 'subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/policyAssignments'
 
       request_url = @base_url || @client.base_url
 
@@ -582,7 +582,7 @@ def list_async(filter = nil, custom_headers = nil)
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyassignments'
+      path_template = 'subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyAssignments'
 
       request_url = @base_url || @client.base_url
 
diff --git a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_client.rb b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_client.rb
index b6f8ce000d..f42ed72411 100644
--- a/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_client.rb
+++ b/management/azure_mgmt_policy/lib/generated/azure_mgmt_policy/policy_client.rb
@@ -34,12 +34,12 @@ class PolicyClient < MsRestAzure::AzureServiceClient
     # is generated and included in each request. Default is true.
     attr_accessor :generate_client_request_id
 
-    # @return [PolicyAssignments] policy_assignments
-    attr_reader :policy_assignments
-
     # @return [PolicyDefinitions] policy_definitions
     attr_reader :policy_definitions
 
+    # @return [PolicyAssignments] policy_assignments
+    attr_reader :policy_assignments
+
     #
     # Creates initializes a new instance of the PolicyClient class.
     # @param credentials [MsRest::ServiceClientCredentials] credentials to authorize HTTP requests made by the service client.
@@ -53,8 +53,8 @@ def initialize(credentials = nil, base_url = nil, options = nil)
       fail ArgumentError, 'invalid type of credentials input parameter' unless credentials.is_a?(MsRest::ServiceClientCredentials) unless credentials.nil?
       @credentials = credentials
 
-      @policy_assignments = PolicyAssignments.new(self)
       @policy_definitions = PolicyDefinitions.new(self)
+      @policy_assignments = PolicyAssignments.new(self)
       @api_version = '2016-12-01'
       @accept_language = 'en-US'
       @long_running_operation_retry_timeout = 30