Generated from 987cf0fd2d940806c3edb71ca8471a7150be32dc (#744)

management/azure_mgmt_graph/lib/generated/azure_mgmt_graph/applications.rb

@@ -9,7 +9,6 @@ module Azure::ARM::Graph
   # management client.
   #
   class Applications
-    include Azure::ARM::Graph::Models
     include MsRestAzure
 
     #
@@ -77,11 +76,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = ApplicationCreateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::ApplicationCreateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/applications'
+      path_template = '{tenantID}/applications'
 
       request_url = @base_url || @client.base_url
 
@@ -109,7 +108,7 @@ module Azure::ARM::Graph
         if status_code == 201
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Application.mapper()
+            result_mapper = Azure::ARM::Graph::Models::Application.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -168,7 +167,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/applications'
+      path_template = '{tenantID}/applications'
 
       request_url = @base_url || @client.base_url
 
@@ -195,7 +194,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ApplicationListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ApplicationListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -254,7 +253,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/applications/{applicationObjectId}'
+      path_template = '{tenantID}/applications/{applicationObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -332,7 +331,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/applications/{applicationObjectId}'
+      path_template = '{tenantID}/applications/{applicationObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -360,7 +359,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = Application.mapper()
+            result_mapper = Azure::ARM::Graph::Models::Application.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -430,11 +429,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = ApplicationUpdateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::ApplicationUpdateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/applications/{applicationObjectId}'
+      path_template = '{tenantID}/applications/{applicationObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -513,7 +512,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/applications/{applicationObjectId}/keyCredentials'
+      path_template = '{tenantID}/applications/{applicationObjectId}/keyCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -541,7 +540,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = KeyCredentialListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::KeyCredentialListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -611,11 +610,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = KeyCredentialsUpdateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::KeyCredentialsUpdateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/applications/{applicationObjectId}/keyCredentials'
+      path_template = '{tenantID}/applications/{applicationObjectId}/keyCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -694,7 +693,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'
+      path_template = '{tenantID}/applications/{applicationObjectId}/passwordCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -722,7 +721,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = PasswordCredentialListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::PasswordCredentialListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -792,11 +791,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = PasswordCredentialsUpdateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::PasswordCredentialsUpdateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'
+      path_template = '{tenantID}/applications/{applicationObjectId}/passwordCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -875,7 +874,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/{nextLink}'
+      path_template = '{tenantID}/{nextLink}'
 
       request_url = @base_url || @client.base_url
 
@@ -903,7 +902,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ApplicationListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ApplicationListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)

management/azure_mgmt_graph/lib/generated/azure_mgmt_graph/groups.rb

@@ -9,7 +9,6 @@ module Azure::ARM::Graph
   # management client.
   #
   class Groups
-    include Azure::ARM::Graph::Models
     include MsRestAzure
 
     #
@@ -80,11 +79,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = CheckGroupMembershipParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::CheckGroupMembershipParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/isMemberOf'
+      path_template = '{tenantID}/isMemberOf'
 
       request_url = @base_url || @client.base_url
 
@@ -112,7 +111,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = CheckGroupMembershipResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::CheckGroupMembershipResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -178,7 +177,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/groups/{groupObjectId}/$links/members/{memberObjectId}'
+      path_template = '{tenantID}/groups/{groupObjectId}/$links/members/{memberObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -272,11 +271,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = GroupAddMemberParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::GroupAddMemberParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/groups/{groupObjectId}/$links/members'
+      path_template = '{tenantID}/groups/{groupObjectId}/$links/members'
 
       request_url = @base_url || @client.base_url
 
@@ -354,7 +353,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/groups/{groupObjectId}'
+      path_template = '{tenantID}/groups/{groupObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -439,11 +438,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = GroupCreateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::GroupCreateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/groups'
+      path_template = '{tenantID}/groups'
 
       request_url = @base_url || @client.base_url
 
@@ -471,7 +470,7 @@ module Azure::ARM::Graph
         if status_code == 201
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ADGroup.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ADGroup.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -530,7 +529,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/groups'
+      path_template = '{tenantID}/groups'
 
       request_url = @base_url || @client.base_url
 
@@ -557,7 +556,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = GroupListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::GroupListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -620,7 +619,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/groups/{objectId}/members'
+      path_template = '{tenantID}/groups/{objectId}/members'
 
       request_url = @base_url || @client.base_url
 
@@ -648,7 +647,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = GetObjectsResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::GetObjectsResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -711,7 +710,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/groups/{objectId}'
+      path_template = '{tenantID}/groups/{objectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -739,7 +738,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ADGroup.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ADGroup.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -816,11 +815,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = GroupGetMemberGroupsParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::GroupGetMemberGroupsParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/groups/{objectId}/getMemberGroups'
+      path_template = '{tenantID}/groups/{objectId}/getMemberGroups'
 
       request_url = @base_url || @client.base_url
 
@@ -849,7 +848,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = GroupGetMemberGroupsResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::GroupGetMemberGroupsResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -909,7 +908,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/{nextLink}'
+      path_template = '{tenantID}/{nextLink}'
 
       request_url = @base_url || @client.base_url
 
@@ -937,7 +936,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = GroupListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::GroupListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -997,7 +996,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/{nextLink}'
+      path_template = '{tenantID}/{nextLink}'
 
       request_url = @base_url || @client.base_url
 
@@ -1025,7 +1024,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = GetObjectsResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::GetObjectsResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)

management/azure_mgmt_graph/lib/generated/azure_mgmt_graph/objects.rb

@@ -9,7 +9,6 @@ module Azure::ARM::Graph
   # management client.
   #
   class Objects
-    include Azure::ARM::Graph::Models
     include MsRestAzure
 
     #
@@ -66,7 +65,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/me'
+      path_template = '{tenantID}/me'
 
       request_url = @base_url || @client.base_url
 
@@ -93,7 +92,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = AADObject.mapper()
+            result_mapper = Azure::ARM::Graph::Models::AADObject.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -144,7 +143,7 @@ module Azure::ARM::Graph
     #
     def get_objects_by_object_ids_async(parameters, custom_headers = nil)
       fail ArgumentError, 'parameters is nil' if parameters.nil?
-      api_version = '1.6-internal'
+      api_version = '1.6'
       fail ArgumentError, '@client.tenant_id is nil' if @client.tenant_id.nil?
 
 
@@ -157,11 +156,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = GetObjectsParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::GetObjectsParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/getObjectsByObjectIds'
+      path_template = '{tenantID}/getObjectsByObjectIds'
 
       request_url = @base_url || @client.base_url
 
@@ -189,7 +188,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = GetObjectsResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::GetObjectsResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -240,7 +239,7 @@ module Azure::ARM::Graph
     #
     def get_objects_by_object_ids_next_async(next_link, custom_headers = nil)
       fail ArgumentError, 'next_link is nil' if next_link.nil?
-      api_version = '1.6-internal'
+      api_version = '1.6'
       fail ArgumentError, '@client.tenant_id is nil' if @client.tenant_id.nil?
 
 
@@ -249,7 +248,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/{nextLink}'
+      path_template = '{tenantID}/{nextLink}'
 
       request_url = @base_url || @client.base_url
 
@@ -277,7 +276,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = GetObjectsResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::GetObjectsResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)

management/azure_mgmt_graph/lib/generated/azure_mgmt_graph/service_principals.rb

@@ -9,7 +9,6 @@ module Azure::ARM::Graph
   # management client.
   #
   class ServicePrincipals
-    include Azure::ARM::Graph::Models
     include MsRestAzure
 
     #
@@ -77,11 +76,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = ServicePrincipalCreateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::ServicePrincipalCreateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/servicePrincipals'
+      path_template = '{tenantID}/servicePrincipals'
 
       request_url = @base_url || @client.base_url
 
@@ -109,7 +108,7 @@ module Azure::ARM::Graph
         if status_code == 201
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ServicePrincipal.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ServicePrincipal.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -168,7 +167,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/servicePrincipals'
+      path_template = '{tenantID}/servicePrincipals'
 
       request_url = @base_url || @client.base_url
 
@@ -195,7 +194,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ServicePrincipalListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ServicePrincipalListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -254,7 +253,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/servicePrincipals/{objectId}'
+      path_template = '{tenantID}/servicePrincipals/{objectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -332,7 +331,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/servicePrincipals/{objectId}'
+      path_template = '{tenantID}/servicePrincipals/{objectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -360,7 +359,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ServicePrincipal.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ServicePrincipal.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -423,7 +422,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/servicePrincipals/{objectId}/keyCredentials'
+      path_template = '{tenantID}/servicePrincipals/{objectId}/keyCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -451,7 +450,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = KeyCredentialListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::KeyCredentialListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -524,11 +523,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = KeyCredentialsUpdateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::KeyCredentialsUpdateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/servicePrincipals/{objectId}/keyCredentials'
+      path_template = '{tenantID}/servicePrincipals/{objectId}/keyCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -607,7 +606,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/servicePrincipals/{objectId}/passwordCredentials'
+      path_template = '{tenantID}/servicePrincipals/{objectId}/passwordCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -635,7 +634,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = PasswordCredentialListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::PasswordCredentialListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -705,11 +704,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = PasswordCredentialsUpdateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::PasswordCredentialsUpdateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/servicePrincipals/{objectId}/passwordCredentials'
+      path_template = '{tenantID}/servicePrincipals/{objectId}/passwordCredentials'
 
       request_url = @base_url || @client.base_url
 
@@ -788,7 +787,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/{nextLink}'
+      path_template = '{tenantID}/{nextLink}'
 
       request_url = @base_url || @client.base_url
 
@@ -816,7 +815,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = ServicePrincipalListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::ServicePrincipalListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)

management/azure_mgmt_graph/lib/generated/azure_mgmt_graph/users.rb

@@ -9,7 +9,6 @@ module Azure::ARM::Graph
   # management client.
   #
   class Users
-    include Azure::ARM::Graph::Models
     include MsRestAzure
 
     #
@@ -74,11 +73,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = UserCreateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::UserCreateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/users'
+      path_template = '{tenantID}/users'
 
       request_url = @base_url || @client.base_url
 
@@ -106,7 +105,7 @@ module Azure::ARM::Graph
         if status_code == 201
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = User.mapper()
+            result_mapper = Azure::ARM::Graph::Models::User.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -165,7 +164,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/users'
+      path_template = '{tenantID}/users'
 
       request_url = @base_url || @client.base_url
 
@@ -192,7 +191,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = UserListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::UserListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -255,7 +254,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/users/{upnOrObjectId}'
+      path_template = '{tenantID}/users/{upnOrObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -283,7 +282,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = User.mapper()
+            result_mapper = Azure::ARM::Graph::Models::User.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -356,11 +355,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = UserUpdateParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::UserUpdateParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/users/{upnOrObjectId}'
+      path_template = '{tenantID}/users/{upnOrObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -441,7 +440,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/users/{upnOrObjectId}'
+      path_template = '{tenantID}/users/{upnOrObjectId}'
 
       request_url = @base_url || @client.base_url
 
@@ -533,11 +532,11 @@ module Azure::ARM::Graph
       request_headers['Content-Type'] = 'application/json; charset=utf-8'
 
       # Serialize Request
-      request_mapper = UserGetMemberGroupsParameters.mapper()
+      request_mapper = Azure::ARM::Graph::Models::UserGetMemberGroupsParameters.mapper()
       request_content = @client.serialize(request_mapper,  parameters, 'parameters')
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = '/{tenantID}/users/{objectId}/getMemberGroups'
+      path_template = '{tenantID}/users/{objectId}/getMemberGroups'
 
       request_url = @base_url || @client.base_url
 
@@ -566,7 +565,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = UserGetMemberGroupsResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::UserGetMemberGroupsResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
@@ -626,7 +625,7 @@ module Azure::ARM::Graph
       # 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 = '/{tenantID}/{nextLink}'
+      path_template = '{tenantID}/{nextLink}'
 
       request_url = @base_url || @client.base_url
 
@@ -654,7 +653,7 @@ module Azure::ARM::Graph
         if status_code == 200
           begin
             parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
-            result_mapper = UserListResult.mapper()
+            result_mapper = Azure::ARM::Graph::Models::UserListResult.mapper()
             result.body = @client.deserialize(result_mapper, parsed_response, 'result.body')
           rescue Exception => e
             fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)