google-api-client 0.9.pre3 → 0.9.pre4

data/generated/google/apis/admin_directory_v1/representations.rb

@@ -38,6 +38,14 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation; end
       end
       
+      class CalendarResource
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class CalendarResources
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
       class Channel
         class Representation < Google::Apis::Core::JsonRepresentation; end
       end
@@ -58,6 +66,30 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation; end
       end
       
+      class Customer
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class CustomerPostalAddress
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class DomainAlias
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class DomainAliases
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class Domains
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class Domains2
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
       class Group
         class Representation < Google::Apis::Core::JsonRepresentation; end
       end
@@ -106,6 +138,34 @@ module Google
         class Representation < Google::Apis::Core::JsonRepresentation; end
       end
       
+      class Privilege
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class Privileges
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class Role
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+        
+        class RolePrivilege
+          class Representation < Google::Apis::Core::JsonRepresentation; end
+        end
+      end
+      
+      class RoleAssignment
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class RoleAssignments
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
+      class Roles
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      end
+      
       class Schema
         class Representation < Google::Apis::Core::JsonRepresentation; end
       end
@@ -242,6 +302,30 @@ module Google
         end
       end
       
+      class CalendarResource
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :etags, as: 'etags'
+          property :kind, as: 'kind'
+          property :resource_description, as: 'resourceDescription'
+          property :resource_email, as: 'resourceEmail'
+          property :resource_id, as: 'resourceId'
+          property :resource_name, as: 'resourceName'
+          property :resource_type, as: 'resourceType'
+        end
+      end
+      
+      class CalendarResources
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :etag, as: 'etag'
+          collection :items, as: 'items', class: Google::Apis::AdminDirectoryV1::CalendarResource, decorator: Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+      
+          property :kind, as: 'kind'
+          property :next_page_token, as: 'nextPageToken'
+        end
+      end
+      
       class Channel
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -322,6 +406,84 @@ module Google
         end
       end
       
+      class Customer
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :alternate_email, as: 'alternateEmail'
+          property :customer_creation_time, as: 'customerCreationTime', type: DateTime
+      
+          property :customer_domain, as: 'customerDomain'
+          property :etag, as: 'etag'
+          property :id, as: 'id'
+          property :kind, as: 'kind'
+          property :language, as: 'language'
+          property :phone_number, as: 'phoneNumber'
+          property :postal_address, as: 'postalAddress', class: Google::Apis::AdminDirectoryV1::CustomerPostalAddress, decorator: Google::Apis::AdminDirectoryV1::CustomerPostalAddress::Representation
+      
+        end
+      end
+      
+      class CustomerPostalAddress
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :address_line1, as: 'addressLine1'
+          property :address_line2, as: 'addressLine2'
+          property :address_line3, as: 'addressLine3'
+          property :contact_name, as: 'contactName'
+          property :country_code, as: 'countryCode'
+          property :locality, as: 'locality'
+          property :organization_name, as: 'organizationName'
+          property :postal_code, as: 'postalCode'
+          property :region, as: 'region'
+        end
+      end
+      
+      class DomainAlias
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :creation_time, as: 'creationTime'
+          property :domain_alias_name, as: 'domainAliasName'
+          property :etag, as: 'etag'
+          property :kind, as: 'kind'
+          property :parent_domain_name, as: 'parentDomainName'
+          property :verified, as: 'verified'
+        end
+      end
+      
+      class DomainAliases
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :domain_aliases, as: 'domainAliases', class: Google::Apis::AdminDirectoryV1::DomainAlias, decorator: Google::Apis::AdminDirectoryV1::DomainAlias::Representation
+      
+          property :etag, as: 'etag'
+          property :kind, as: 'kind'
+        end
+      end
+      
+      class Domains
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :creation_time, as: 'creationTime'
+          collection :domain_aliases, as: 'domainAliases', class: Google::Apis::AdminDirectoryV1::DomainAlias, decorator: Google::Apis::AdminDirectoryV1::DomainAlias::Representation
+      
+          property :domain_name, as: 'domainName'
+          property :etag, as: 'etag'
+          property :is_primary, as: 'isPrimary'
+          property :kind, as: 'kind'
+          property :verified, as: 'verified'
+        end
+      end
+      
+      class Domains2
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :domains, as: 'domains', class: Google::Apis::AdminDirectoryV1::Domains, decorator: Google::Apis::AdminDirectoryV1::Domains::Representation
+      
+          property :etag, as: 'etag'
+          property :kind, as: 'kind'
+        end
+      end
+      
       class Group
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -493,6 +655,88 @@ module Google
         end
       end
       
+      class Privilege
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          collection :child_privileges, as: 'childPrivileges', class: Google::Apis::AdminDirectoryV1::Privilege, decorator: Google::Apis::AdminDirectoryV1::Privilege::Representation
+      
+          property :etag, as: 'etag'
+          property :is_ou_scopable, as: 'isOuScopable'
+          property :kind, as: 'kind'
+          property :privilege_name, as: 'privilegeName'
+          property :service_id, as: 'serviceId'
+          property :service_name, as: 'serviceName'
+        end
+      end
+      
+      class Privileges
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :etag, as: 'etag'
+          collection :items, as: 'items', class: Google::Apis::AdminDirectoryV1::Privilege, decorator: Google::Apis::AdminDirectoryV1::Privilege::Representation
+      
+          property :kind, as: 'kind'
+        end
+      end
+      
+      class Role
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :etag, as: 'etag'
+          property :is_super_admin_role, as: 'isSuperAdminRole'
+          property :is_system_role, as: 'isSystemRole'
+          property :kind, as: 'kind'
+          property :role_description, as: 'roleDescription'
+          property :role_id, as: 'roleId'
+          property :role_name, as: 'roleName'
+          collection :role_privileges, as: 'rolePrivileges', class: Google::Apis::AdminDirectoryV1::Role::RolePrivilege, decorator: Google::Apis::AdminDirectoryV1::Role::RolePrivilege::Representation
+      
+        end
+        
+        class RolePrivilege
+          # @private
+          class Representation < Google::Apis::Core::JsonRepresentation
+            property :privilege_name, as: 'privilegeName'
+            property :service_id, as: 'serviceId'
+          end
+        end
+      end
+      
+      class RoleAssignment
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :assigned_to, as: 'assignedTo'
+          property :etag, as: 'etag'
+          property :kind, as: 'kind'
+          property :org_unit_id, as: 'orgUnitId'
+          property :role_assignment_id, as: 'roleAssignmentId'
+          property :role_id, as: 'roleId'
+          property :scope_type, as: 'scopeType'
+        end
+      end
+      
+      class RoleAssignments
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :etag, as: 'etag'
+          collection :items, as: 'items', class: Google::Apis::AdminDirectoryV1::RoleAssignment, decorator: Google::Apis::AdminDirectoryV1::RoleAssignment::Representation
+      
+          property :kind, as: 'kind'
+          property :next_page_token, as: 'nextPageToken'
+        end
+      end
+      
+      class Roles
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :etag, as: 'etag'
+          collection :items, as: 'items', class: Google::Apis::AdminDirectoryV1::Role, decorator: Google::Apis::AdminDirectoryV1::Role::Representation
+      
+          property :kind, as: 'kind'
+          property :next_page_token, as: 'nextPageToken'
+        end
+      end
+      
       class Schema
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation

data/generated/google/apis/admin_directory_v1/service.rb

@@ -81,8 +81,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def delete_asp(user_key, code_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/asps/{codeId}'
-          command =  make_simple_command(:delete, path, options)
+          command =  make_simple_command(:delete, 'users/{userKey}/asps/{codeId}', options)
           command.params['userKey'] = user_key unless user_key.nil?
           command.params['codeId'] = code_id unless code_id.nil?
           command.query['fields'] = fields unless fields.nil?
@@ -119,8 +118,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def get_asp(user_key, code_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/asps/{codeId}'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}/asps/{codeId}', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Asp::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Asp
           command.params['userKey'] = user_key unless user_key.nil?
@@ -157,8 +155,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def list_asps(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/asps'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}/asps', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Asps::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Asps
           command.params['userKey'] = user_key unless user_key.nil?
@@ -192,8 +189,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def stop_channel(channel_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = '/admin/directory_v1/channels/stop'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, '/admin/directory_v1/channels/stop', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::Channel::Representation
           command.request_object = channel_object
           command.query['fields'] = fields unless fields.nil?
@@ -231,8 +227,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def get_chrome_os_device(customer_id, device_id, projection: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/chromeos/{deviceId}'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'customer/{customerId}/devices/chromeos/{deviceId}', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::ChromeOsDevice::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::ChromeOsDevice
           command.params['customerId'] = customer_id unless customer_id.nil?
@@ -283,8 +278,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def list_chrome_os_devices(customer_id, max_results: nil, order_by: nil, page_token: nil, projection: nil, query: nil, sort_order: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/chromeos'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'customer/{customerId}/devices/chromeos', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::ChromeOsDevices::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::ChromeOsDevices
           command.params['customerId'] = customer_id unless customer_id.nil?
@@ -330,8 +324,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def patch_chrome_os_device(customer_id, device_id, chrome_os_device_object = nil, projection: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/chromeos/{deviceId}'
-          command =  make_simple_command(:patch, path, options)
+          command =  make_simple_command(:patch, 'customer/{customerId}/devices/chromeos/{deviceId}', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::ChromeOsDevice::Representation
           command.request_object = chrome_os_device_object
           command.response_representation = Google::Apis::AdminDirectoryV1::ChromeOsDevice::Representation
@@ -375,8 +368,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def update_chrome_os_device(customer_id, device_id, chrome_os_device_object = nil, projection: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/chromeos/{deviceId}'
-          command =  make_simple_command(:put, path, options)
+          command =  make_simple_command(:put, 'customer/{customerId}/devices/chromeos/{deviceId}', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::ChromeOsDevice::Representation
           command.request_object = chrome_os_device_object
           command.response_representation = Google::Apis::AdminDirectoryV1::ChromeOsDevice::Representation
@@ -390,9 +382,9 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Delete Group
-        # @param [String] group_key
-        #   Email or immutable Id of the group
+        # Retrives a customer.
+        # @param [String] customer_key
+        #   Id of the customer to be retrieved
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -406,27 +398,29 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Customer] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [void]
+        # @return [Google::Apis::AdminDirectoryV1::Customer]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_group(group_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}'
-          command =  make_simple_command(:delete, path, options)
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def get_customer(customer_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customers/{customerKey}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Customer::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Customer
+          command.params['customerKey'] = customer_key unless customer_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve Group
-        # @param [String] group_key
-        #   Email or immutable Id of the group
+        # Updates a customer. This method supports patch semantics.
+        # @param [String] customer_key
+        #   Id of the customer to be updated
+        # @param [Google::Apis::AdminDirectoryV1::Customer] customer_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -440,28 +434,31 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Customer] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Group]
+        # @return [Google::Apis::AdminDirectoryV1::Customer]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_group(group_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Group
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def patch_customer(customer_key, customer_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'customers/{customerKey}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Customer::Representation
+          command.request_object = customer_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Customer::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Customer
+          command.params['customerKey'] = customer_key unless customer_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Create Group
-        # @param [Google::Apis::AdminDirectoryV1::Group] group_object
+        # Updates a customer.
+        # @param [String] customer_key
+        #   Id of the customer to be updated
+        # @param [Google::Apis::AdminDirectoryV1::Customer] customer_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -475,41 +472,32 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Customer] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Group]
+        # @return [Google::Apis::AdminDirectoryV1::Customer]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_group(group_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups'
-          command =  make_simple_command(:post, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Group::Representation
-          command.request_object = group_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Group
+        def update_customer(customer_key, customer_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'customers/{customerKey}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Customer::Representation
+          command.request_object = customer_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Customer::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Customer
+          command.params['customerKey'] = customer_key unless customer_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve all groups in a domain (paginated)
+        # Deletes a Domain Alias of the customer.
         # @param [String] customer
-        #   Immutable id of the Google Apps account. In case of multi-domain, to fetch all
-        #   groups for a customer, fill this field instead of domain.
-        # @param [String] domain
-        #   Name of the domain. Fill this field to get groups from only this domain. To
-        #   return all groups in a multi-domain fill customer field instead.
-        # @param [Fixnum] max_results
-        #   Maximum number of results to return. Default is 200
-        # @param [String] page_token
-        #   Token to specify next page in the list
-        # @param [String] user_key
-        #   Email or immutable Id of the user if only those groups are to be listed, the
-        #   given user is a member of. If Id, it should match with id of user object
+        #   Immutable id of the Google Apps account.
+        # @param [String] domain_alias_name
+        #   Name of domain alias to be retrieved.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -523,35 +511,29 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Groups] parsed result object
+        # @yieldparam result [NilClass] No result returned for this method
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Groups]
+        # @return [void]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_groups(customer: nil, domain: nil, max_results: nil, page_token: nil, user_key: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::Groups::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Groups
-          command.query['customer'] = customer unless customer.nil?
-          command.query['domain'] = domain unless domain.nil?
-          command.query['maxResults'] = max_results unless max_results.nil?
-          command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['userKey'] = user_key unless user_key.nil?
+        def delete_domain_alias(customer, domain_alias_name, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customer}/domainaliases/{domainAliasName}', options)
+          command.params['customer'] = customer unless customer.nil?
+          command.params['domainAliasName'] = domain_alias_name unless domain_alias_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update Group. This method supports patch semantics.
-        # @param [String] group_key
-        #   Email or immutable Id of the group. If Id, it should match with id of group
-        #   object
-        # @param [Google::Apis::AdminDirectoryV1::Group] group_object
+        # Retrieves a domain alias of the customer.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [String] domain_alias_name
+        #   Name of domain alias to be retrieved.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -565,33 +547,30 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::DomainAlias] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Group]
+        # @return [Google::Apis::AdminDirectoryV1::DomainAlias]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_group(group_key, group_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}'
-          command =  make_simple_command(:patch, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Group::Representation
-          command.request_object = group_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Group
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def get_domain_alias(customer, domain_alias_name, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/domainaliases/{domainAliasName}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::DomainAlias::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::DomainAlias
+          command.params['customer'] = customer unless customer.nil?
+          command.params['domainAliasName'] = domain_alias_name unless domain_alias_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update Group
-        # @param [String] group_key
-        #   Email or immutable Id of the group. If Id, it should match with id of group
-        #   object
-        # @param [Google::Apis::AdminDirectoryV1::Group] group_object
+        # Inserts a Domain alias of the customer.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [Google::Apis::AdminDirectoryV1::DomainAlias] domain_alias_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -605,33 +584,70 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::DomainAlias] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Group]
+        # @return [Google::Apis::AdminDirectoryV1::DomainAlias]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_group(group_key, group_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}'
-          command =  make_simple_command(:put, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Group::Representation
-          command.request_object = group_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Group
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def insert_domain_alias(customer, domain_alias_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'customer/{customer}/domainaliases', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::DomainAlias::Representation
+          command.request_object = domain_alias_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::DomainAlias::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::DomainAlias
+          command.params['customer'] = customer unless customer.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Remove a alias for the group
-        # @param [String] group_key
-        #   Email or immutable Id of the group
-        # @param [String] group_alias
-        #   The alias to be removed
+        # Lists the domain aliases of the customer.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [String] parent_domain_name
+        #   Name of the parent domain for which domain aliases are to be fetched.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::DomainAliases] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::DomainAliases]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_domain_aliases(customer, parent_domain_name: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/domainaliases', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::DomainAliases::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::DomainAliases
+          command.params['customer'] = customer unless customer.nil?
+          command.query['parentDomainName'] = parent_domain_name unless parent_domain_name.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Deletes a domain of the customer.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [String] domain_name
+        #   Name of domain to be deleted
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -653,21 +669,21 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_group_alias(group_key, group_alias, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/aliases/{alias}'
-          command =  make_simple_command(:delete, path, options)
-          command.params['groupKey'] = group_key unless group_key.nil?
-          command.params['alias'] = group_alias unless group_alias.nil?
+        def delete_domain(customer, domain_name, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customer}/domains/{domainName}', options)
+          command.params['customer'] = customer unless customer.nil?
+          command.params['domainName'] = domain_name unless domain_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Add a alias for the group
-        # @param [String] group_key
-        #   Email or immutable Id of the group
-        # @param [Google::Apis::AdminDirectoryV1::Alias] alias_object
+        # Retrives a domain of the customer.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [String] domain_name
+        #   Name of domain to be retrieved
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -681,31 +697,30 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Alias] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Domains] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Alias]
+        # @return [Google::Apis::AdminDirectoryV1::Domains]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_group_alias(group_key, alias_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/aliases'
-          command =  make_simple_command(:post, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Alias::Representation
-          command.request_object = alias_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Alias::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Alias
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def get_domain(customer, domain_name, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/domains/{domainName}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Domains::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Domains
+          command.params['customer'] = customer unless customer.nil?
+          command.params['domainName'] = domain_name unless domain_name.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # List all aliases for a group
-        # @param [String] group_key
-        #   Email or immutable Id of the group
+        # Inserts a domain of the customer.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [Google::Apis::AdminDirectoryV1::Domains] domains_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -719,31 +734,65 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Aliases] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Domains] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Aliases]
+        # @return [Google::Apis::AdminDirectoryV1::Domains]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_group_aliases(group_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/aliases'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::Aliases::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Aliases
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def insert_domain(customer, domains_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'customer/{customer}/domains', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Domains::Representation
+          command.request_object = domains_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Domains::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Domains
+          command.params['customer'] = customer unless customer.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Remove membership.
+        # Lists the domains of the customer.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Domains2] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Domains2]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_domains(customer, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/domains', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Domains2::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Domains2
+          command.params['customer'] = customer unless customer.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Delete Group
         # @param [String] group_key
         #   Email or immutable Id of the group
-        # @param [String] member_key
-        #   Email or immutable Id of the member
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -765,22 +814,18 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_member(group_key, member_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/members/{memberKey}'
-          command =  make_simple_command(:delete, path, options)
+        def delete_group(group_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'groups/{groupKey}', options)
           command.params['groupKey'] = group_key unless group_key.nil?
-          command.params['memberKey'] = member_key unless member_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve Group Member
+        # Retrieve Group
         # @param [String] group_key
         #   Email or immutable Id of the group
-        # @param [String] member_key
-        #   Email or immutable Id of the member
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -794,31 +839,27 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Member]
+        # @return [Google::Apis::AdminDirectoryV1::Group]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_member(group_key, member_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/members/{memberKey}'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Member
+        def get_group(group_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'groups/{groupKey}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Group
           command.params['groupKey'] = group_key unless group_key.nil?
-          command.params['memberKey'] = member_key unless member_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Add user to the specified group.
-        # @param [String] group_key
-        #   Email or immutable Id of the group
-        # @param [Google::Apis::AdminDirectoryV1::Member] member_object
+        # Create Group
+        # @param [Google::Apis::AdminDirectoryV1::Group] group_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -832,37 +873,40 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Member]
+        # @return [Google::Apis::AdminDirectoryV1::Group]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_member(group_key, member_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/members'
-          command =  make_simple_command(:post, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Member::Representation
-          command.request_object = member_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Member
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def insert_group(group_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'groups', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Group::Representation
+          command.request_object = group_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Group
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve all members in a group (paginated)
-        # @param [String] group_key
-        #   Email or immutable Id of the group
+        # Retrieve all groups in a domain (paginated)
+        # @param [String] customer
+        #   Immutable id of the Google Apps account. In case of multi-domain, to fetch all
+        #   groups for a customer, fill this field instead of domain.
+        # @param [String] domain
+        #   Name of the domain. Fill this field to get groups from only this domain. To
+        #   return all groups in a multi-domain fill customer field instead.
         # @param [Fixnum] max_results
         #   Maximum number of results to return. Default is 200
         # @param [String] page_token
         #   Token to specify next page in the list
-        # @param [String] roles
-        #   Comma separated role values to filter list results on.
+        # @param [String] user_key
+        #   Email or immutable Id of the user if only those groups are to be listed, the
+        #   given user is a member of. If Id, it should match with id of user object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -876,38 +920,34 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Members] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Groups] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Members]
+        # @return [Google::Apis::AdminDirectoryV1::Groups]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_members(group_key, max_results: nil, page_token: nil, roles: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/members'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::Members::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Members
-          command.params['groupKey'] = group_key unless group_key.nil?
+        def list_groups(customer: nil, domain: nil, max_results: nil, page_token: nil, user_key: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'groups', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Groups::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Groups
+          command.query['customer'] = customer unless customer.nil?
+          command.query['domain'] = domain unless domain.nil?
           command.query['maxResults'] = max_results unless max_results.nil?
           command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['roles'] = roles unless roles.nil?
+          command.query['userKey'] = user_key unless user_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update membership of a user in the specified group. This method supports patch
-        # semantics.
+        # Update Group. This method supports patch semantics.
         # @param [String] group_key
         #   Email or immutable Id of the group. If Id, it should match with id of group
         #   object
-        # @param [String] member_key
-        #   Email or immutable Id of the user. If Id, it should match with id of member
-        #   object
-        # @param [Google::Apis::AdminDirectoryV1::Member] member_object
+        # @param [Google::Apis::AdminDirectoryV1::Group] group_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -921,36 +961,252 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Member]
+        # @return [Google::Apis::AdminDirectoryV1::Group]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_member(group_key, member_key, member_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/members/{memberKey}'
-          command =  make_simple_command(:patch, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Member::Representation
-          command.request_object = member_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Member
+        def patch_group(group_key, group_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'groups/{groupKey}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Group::Representation
+          command.request_object = group_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Group
           command.params['groupKey'] = group_key unless group_key.nil?
-          command.params['memberKey'] = member_key unless member_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update membership of a user in the specified group.
+        # Update Group
         # @param [String] group_key
         #   Email or immutable Id of the group. If Id, it should match with id of group
         #   object
+        # @param [Google::Apis::AdminDirectoryV1::Group] group_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Group] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Group]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def update_group(group_key, group_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'groups/{groupKey}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Group::Representation
+          command.request_object = group_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Group::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Group
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Remove a alias for the group
+        # @param [String] group_key
+        #   Email or immutable Id of the group
+        # @param [String] group_alias
+        #   The alias to be removed
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [void]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def delete_group_alias(group_key, group_alias, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'groups/{groupKey}/aliases/{alias}', options)
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.params['alias'] = group_alias unless group_alias.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Add a alias for the group
+        # @param [String] group_key
+        #   Email or immutable Id of the group
+        # @param [Google::Apis::AdminDirectoryV1::Alias] alias_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Alias] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Alias]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def insert_group_alias(group_key, alias_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'groups/{groupKey}/aliases', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Alias::Representation
+          command.request_object = alias_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Alias::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Alias
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # List all aliases for a group
+        # @param [String] group_key
+        #   Email or immutable Id of the group
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Aliases] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Aliases]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_group_aliases(group_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'groups/{groupKey}/aliases', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Aliases::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Aliases
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Remove membership.
+        # @param [String] group_key
+        #   Email or immutable Id of the group
         # @param [String] member_key
-        #   Email or immutable Id of the user. If Id, it should match with id of member
-        #   object
+        #   Email or immutable Id of the member
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [void]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def delete_member(group_key, member_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'groups/{groupKey}/members/{memberKey}', options)
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.params['memberKey'] = member_key unless member_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieve Group Member
+        # @param [String] group_key
+        #   Email or immutable Id of the group
+        # @param [String] member_key
+        #   Email or immutable Id of the member
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Member]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def get_member(group_key, member_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'groups/{groupKey}/members/{memberKey}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Member
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.params['memberKey'] = member_key unless member_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Add user to the specified group.
+        # @param [String] group_key
+        #   Email or immutable Id of the group
         # @param [Google::Apis::AdminDirectoryV1::Member] member_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -965,35 +1221,845 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Member]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def insert_member(group_key, member_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'groups/{groupKey}/members', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Member::Representation
+          command.request_object = member_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Member
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieve all members in a group (paginated)
+        # @param [String] group_key
+        #   Email or immutable Id of the group
+        # @param [Fixnum] max_results
+        #   Maximum number of results to return. Default is 200
+        # @param [String] page_token
+        #   Token to specify next page in the list
+        # @param [String] roles
+        #   Comma separated role values to filter list results on.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Members] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Members]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_members(group_key, max_results: nil, page_token: nil, roles: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'groups/{groupKey}/members', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Members::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Members
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.query['maxResults'] = max_results unless max_results.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['roles'] = roles unless roles.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Update membership of a user in the specified group. This method supports patch
+        # semantics.
+        # @param [String] group_key
+        #   Email or immutable Id of the group. If Id, it should match with id of group
+        #   object
+        # @param [String] member_key
+        #   Email or immutable Id of the user. If Id, it should match with id of member
+        #   object
+        # @param [Google::Apis::AdminDirectoryV1::Member] member_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Member]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def patch_member(group_key, member_key, member_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'groups/{groupKey}/members/{memberKey}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Member::Representation
+          command.request_object = member_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Member
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.params['memberKey'] = member_key unless member_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Update membership of a user in the specified group.
+        # @param [String] group_key
+        #   Email or immutable Id of the group. If Id, it should match with id of group
+        #   object
+        # @param [String] member_key
+        #   Email or immutable Id of the user. If Id, it should match with id of member
+        #   object
+        # @param [Google::Apis::AdminDirectoryV1::Member] member_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Member] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Member]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def update_member(group_key, member_key, member_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'groups/{groupKey}/members/{memberKey}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Member::Representation
+          command.request_object = member_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Member
+          command.params['groupKey'] = group_key unless group_key.nil?
+          command.params['memberKey'] = member_key unless member_key.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Take action on Mobile Device
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [String] resource_id
+        #   Immutable id of Mobile Device
+        # @param [Google::Apis::AdminDirectoryV1::MobileDeviceAction] mobile_device_action_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [void]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def action_mobile_device(customer_id, resource_id, mobile_device_action_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'customer/{customerId}/devices/mobile/{resourceId}/action', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::MobileDeviceAction::Representation
+          command.request_object = mobile_device_action_object
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.params['resourceId'] = resource_id unless resource_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Delete Mobile Device
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [String] resource_id
+        #   Immutable id of Mobile Device
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [void]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def delete_mobile_device(customer_id, resource_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customerId}/devices/mobile/{resourceId}', options)
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.params['resourceId'] = resource_id unless resource_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieve Mobile Device
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [String] resource_id
+        #   Immutable id of Mobile Device
+        # @param [String] projection
+        #   Restrict information returned to a set of selected fields.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::MobileDevice] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::MobileDevice]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def get_mobile_device(customer_id, resource_id, projection: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customerId}/devices/mobile/{resourceId}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::MobileDevice::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::MobileDevice
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.params['resourceId'] = resource_id unless resource_id.nil?
+          command.query['projection'] = projection unless projection.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieve all Mobile Devices of a customer (paginated)
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [Fixnum] max_results
+        #   Maximum number of results to return. Default is 100
+        # @param [String] order_by
+        #   Column to use for sorting results
+        # @param [String] page_token
+        #   Token to specify next page in the list
+        # @param [String] projection
+        #   Restrict information returned to a set of selected fields.
+        # @param [String] query
+        #   Search string in the format given at http://support.google.com/a/bin/answer.py?
+        #   hl=en&answer=1408863#search
+        # @param [String] sort_order
+        #   Whether to return results in ascending or descending order. Only of use when
+        #   orderBy is also used
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::MobileDevices] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::MobileDevices]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_mobile_devices(customer_id, max_results: nil, order_by: nil, page_token: nil, projection: nil, query: nil, sort_order: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customerId}/devices/mobile', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::MobileDevices::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::MobileDevices
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.query['maxResults'] = max_results unless max_results.nil?
+          command.query['orderBy'] = order_by unless order_by.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['projection'] = projection unless projection.nil?
+          command.query['query'] = query unless query.nil?
+          command.query['sortOrder'] = sort_order unless sort_order.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Deletes a notification
+        # @param [String] customer
+        #   The unique ID for the customer's Google account. The customerId is also
+        #   returned as part of the Users resource.
+        # @param [String] notification_id
+        #   The unique ID of the notification.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [void]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def delete_notification(customer, notification_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customer}/notifications/{notificationId}', options)
+          command.params['customer'] = customer unless customer.nil?
+          command.params['notificationId'] = notification_id unless notification_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieves a notification.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account. The customerId is also
+        #   returned as part of the Users resource.
+        # @param [String] notification_id
+        #   The unique ID of the notification.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notification] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Notification]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def get_notification(customer, notification_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/notifications/{notificationId}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Notification
+          command.params['customer'] = customer unless customer.nil?
+          command.params['notificationId'] = notification_id unless notification_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieves a list of notifications.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account.
+        # @param [String] language
+        #   The ISO 639-1 code of the language notifications are returned in. The default
+        #   is English (en).
+        # @param [Fixnum] max_results
+        #   Maximum number of notifications to return per page. The default is 100.
+        # @param [String] page_token
+        #   The token to specify the page of results to retrieve.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notifications] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Notifications]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_notifications(customer, language: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/notifications', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Notifications::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Notifications
+          command.params['customer'] = customer unless customer.nil?
+          command.query['language'] = language unless language.nil?
+          command.query['maxResults'] = max_results unless max_results.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Updates a notification. This method supports patch semantics.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account.
+        # @param [String] notification_id
+        #   The unique ID of the notification.
+        # @param [Google::Apis::AdminDirectoryV1::Notification] notification_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notification] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Notification]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def patch_notification(customer, notification_id, notification_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'customer/{customer}/notifications/{notificationId}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
+          command.request_object = notification_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Notification
+          command.params['customer'] = customer unless customer.nil?
+          command.params['notificationId'] = notification_id unless notification_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Updates a notification.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account.
+        # @param [String] notification_id
+        #   The unique ID of the notification.
+        # @param [Google::Apis::AdminDirectoryV1::Notification] notification_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notification] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Notification]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def update_notification(customer, notification_id, notification_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'customer/{customer}/notifications/{notificationId}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
+          command.request_object = notification_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Notification
+          command.params['customer'] = customer unless customer.nil?
+          command.params['notificationId'] = notification_id unless notification_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Remove Organization Unit
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [Array<String>, String] org_unit_path
+        #   Full path of the organization unit or its Id
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [void]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def delete_org_unit(customer_id, org_unit_path, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customerId}/orgunits{/orgUnitPath*}', options)
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieve Organization Unit
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [Array<String>, String] org_unit_path
+        #   Full path of the organization unit or its Id
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def get_org_unit(customer_id, org_unit_path, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customerId}/orgunits{/orgUnitPath*}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Add Organization Unit
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [Google::Apis::AdminDirectoryV1::OrgUnit] org_unit_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def insert_org_unit(customer_id, org_unit_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'customer/{customerId}/orgunits', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
+          command.request_object = org_unit_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieve all Organization Units
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [String] org_unit_path
+        #   the URL-encoded organization unit's path or its Id
+        # @param [String] type
+        #   Whether to return all sub-organizations or just immediate children
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnits] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::OrgUnits]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_org_units(customer_id, org_unit_path: nil, type: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customerId}/orgunits', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnits::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnits
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.query['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+          command.query['type'] = type unless type.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Update Organization Unit. This method supports patch semantics.
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [Array<String>, String] org_unit_path
+        #   Full path of the organization unit or its Id
+        # @param [Google::Apis::AdminDirectoryV1::OrgUnit] org_unit_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def patch_org_unit(customer_id, org_unit_path, org_unit_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'customer/{customerId}/orgunits{/orgUnitPath*}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
+          command.request_object = org_unit_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Update Organization Unit
+        # @param [String] customer_id
+        #   Immutable id of the Google Apps account
+        # @param [Array<String>, String] org_unit_path
+        #   Full path of the organization unit or its Id
+        # @param [Google::Apis::AdminDirectoryV1::OrgUnit] org_unit_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def update_org_unit(customer_id, org_unit_path, org_unit_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'customer/{customerId}/orgunits{/orgUnitPath*}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
+          command.request_object = org_unit_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
+          command.params['customerId'] = customer_id unless customer_id.nil?
+          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Retrieves a paginated list of all privileges for a customer.
+        # @param [String] customer
+        #   Immutable ID of the Google Apps account.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Privileges] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::AdminDirectoryV1::Privileges]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def list_privileges(customer, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/roles/ALL/privileges', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Privileges::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Privileges
+          command.params['customer'] = customer unless customer.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
+        # Deletes a calendar resource.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account. As an account administrator,
+        #   you can also use the my_customer alias to represent your account's customer ID.
+        # @param [String] calendar_resource_id
+        #   The unique ID of the calendar resource to delete.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   Available to use for quota purposes for server-side applications. Can be any
+        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   Overrides userIp if both are provided.
+        # @param [String] user_ip
+        #   IP address of the site where the request originates. Use this if you want to
+        #   enforce per-user limits.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [NilClass] No result returned for this method
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Member]
+        # @return [void]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_member(group_key, member_key, member_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'groups/{groupKey}/members/{memberKey}'
-          command =  make_simple_command(:put, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Member::Representation
-          command.request_object = member_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Member::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Member
-          command.params['groupKey'] = group_key unless group_key.nil?
-          command.params['memberKey'] = member_key unless member_key.nil?
+        def delete_calendar_resource(customer, calendar_resource_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customer}/resources/calendars/{calendarResourceId}', options)
+          command.params['customer'] = customer unless customer.nil?
+          command.params['calendarResourceId'] = calendar_resource_id unless calendar_resource_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Take action on Mobile Device
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [String] resource_id
-        #   Immutable id of Mobile Device
-        # @param [Google::Apis::AdminDirectoryV1::MobileDeviceAction] mobile_device_action_object
+        # Retrieves a calendar resource.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account. As an account administrator,
+        #   you can also use the my_customer alias to represent your account's customer ID.
+        # @param [String] calendar_resource_id
+        #   The unique ID of the calendar resource to retrieve.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1007,32 +2073,31 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::CalendarResource] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [void]
+        # @return [Google::Apis::AdminDirectoryV1::CalendarResource]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def action_mobile_device(customer_id, resource_id, mobile_device_action_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/mobile/{resourceId}/action'
-          command =  make_simple_command(:post, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::MobileDeviceAction::Representation
-          command.request_object = mobile_device_action_object
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.params['resourceId'] = resource_id unless resource_id.nil?
+        def get_calendar_resource(customer, calendar_resource_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/resources/calendars/{calendarResourceId}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::CalendarResource
+          command.params['customer'] = customer unless customer.nil?
+          command.params['calendarResourceId'] = calendar_resource_id unless calendar_resource_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Delete Mobile Device
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [String] resource_id
-        #   Immutable id of Mobile Device
+        # Inserts a calendar resource.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account. As an account administrator,
+        #   you can also use the my_customer alias to represent your account's customer ID.
+        # @param [Google::Apis::AdminDirectoryV1::CalendarResource] calendar_resource_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1046,32 +2111,35 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::CalendarResource] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [void]
+        # @return [Google::Apis::AdminDirectoryV1::CalendarResource]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_mobile_device(customer_id, resource_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/mobile/{resourceId}'
-          command =  make_simple_command(:delete, path, options)
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.params['resourceId'] = resource_id unless resource_id.nil?
+        def calendar_resource(customer, calendar_resource_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'customer/{customer}/resources/calendars', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+          command.request_object = calendar_resource_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::CalendarResource
+          command.params['customer'] = customer unless customer.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve Mobile Device
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [String] resource_id
-        #   Immutable id of Mobile Device
-        # @param [String] projection
-        #   Restrict information returned to a set of selected fields.
+        # Retrieves a list of calendar resources for an account.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account. As an account administrator,
+        #   you can also use the my_customer alias to represent your account's customer ID.
+        # @param [Fixnum] max_results
+        #   Maximum number of results to return.
+        # @param [String] page_token
+        #   Token to specify the next page in the list.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1085,45 +2153,34 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::MobileDevice] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::CalendarResources] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::MobileDevice]
+        # @return [Google::Apis::AdminDirectoryV1::CalendarResources]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_mobile_device(customer_id, resource_id, projection: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/mobile/{resourceId}'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::MobileDevice::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::MobileDevice
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.params['resourceId'] = resource_id unless resource_id.nil?
-          command.query['projection'] = projection unless projection.nil?
+        def list_calendar_resources(customer, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/resources/calendars', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::CalendarResources::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::CalendarResources
+          command.params['customer'] = customer unless customer.nil?
+          command.query['maxResults'] = max_results unless max_results.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve all Mobile Devices of a customer (paginated)
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [Fixnum] max_results
-        #   Maximum number of results to return. Default is 100
-        # @param [String] order_by
-        #   Column to use for sorting results
-        # @param [String] page_token
-        #   Token to specify next page in the list
-        # @param [String] projection
-        #   Restrict information returned to a set of selected fields.
-        # @param [String] query
-        #   Search string in the format given at http://support.google.com/a/bin/answer.py?
-        #   hl=en&answer=1408863#search
-        # @param [String] sort_order
-        #   Whether to return results in ascending or descending order. Only of use when
-        #   orderBy is also used
+        # Updates a calendar resource. This method supports patch semantics.
+        # @param [String] customer
+        #   The unique ID for the customer's Google account. As an account administrator,
+        #   you can also use the my_customer alias to represent your account's customer ID.
+        # @param [String] calendar_resource_id
+        #   The unique ID of the calendar resource to update.
+        # @param [Google::Apis::AdminDirectoryV1::CalendarResource] calendar_resource_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1137,38 +2194,35 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::MobileDevices] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::CalendarResource] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::MobileDevices]
+        # @return [Google::Apis::AdminDirectoryV1::CalendarResource]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_mobile_devices(customer_id, max_results: nil, order_by: nil, page_token: nil, projection: nil, query: nil, sort_order: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/devices/mobile'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::MobileDevices::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::MobileDevices
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.query['maxResults'] = max_results unless max_results.nil?
-          command.query['orderBy'] = order_by unless order_by.nil?
-          command.query['pageToken'] = page_token unless page_token.nil?
-          command.query['projection'] = projection unless projection.nil?
-          command.query['query'] = query unless query.nil?
-          command.query['sortOrder'] = sort_order unless sort_order.nil?
+        def patch_calendar_resource(customer, calendar_resource_id, calendar_resource_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'customer/{customer}/resources/calendars/{calendarResourceId}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+          command.request_object = calendar_resource_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::CalendarResource
+          command.params['customer'] = customer unless customer.nil?
+          command.params['calendarResourceId'] = calendar_resource_id unless calendar_resource_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes a notification
+        # Updates a calendar resource.
         # @param [String] customer
-        #   The unique ID for the customer's Google account. The customerId is also
-        #   returned as part of the Users resource.
-        # @param [String] notification_id
-        #   The unique ID of the notification.
+        #   The unique ID for the customer's Google account. As an account administrator,
+        #   you can also use the my_customer alias to represent your account's customer ID.
+        # @param [String] calendar_resource_id
+        #   The unique ID of the calendar resource to update.
+        # @param [Google::Apis::AdminDirectoryV1::CalendarResource] calendar_resource_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1182,31 +2236,33 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [NilClass] No result returned for this method
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::CalendarResource] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [void]
+        # @return [Google::Apis::AdminDirectoryV1::CalendarResource]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_notification(customer, notification_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customer}/notifications/{notificationId}'
-          command =  make_simple_command(:delete, path, options)
+        def update_calendar_resource(customer, calendar_resource_id, calendar_resource_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'customer/{customer}/resources/calendars/{calendarResourceId}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+          command.request_object = calendar_resource_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::CalendarResource::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::CalendarResource
           command.params['customer'] = customer unless customer.nil?
-          command.params['notificationId'] = notification_id unless notification_id.nil?
+          command.params['calendarResourceId'] = calendar_resource_id unless calendar_resource_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves a notification.
+        # Deletes a role assignment.
         # @param [String] customer
-        #   The unique ID for the customer's Google account. The customerId is also
-        #   returned as part of the Users resource.
-        # @param [String] notification_id
-        #   The unique ID of the notification.
+        #   Immutable ID of the Google Apps account.
+        # @param [String] role_assignment_id
+        #   Immutable ID of the role assignment.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1220,37 +2276,29 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notification] parsed result object
+        # @yieldparam result [NilClass] No result returned for this method
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Notification]
+        # @return [void]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_notification(customer, notification_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customer}/notifications/{notificationId}'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Notification
+        def delete_role_assignment(customer, role_assignment_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customer}/roleassignments/{roleAssignmentId}', options)
           command.params['customer'] = customer unless customer.nil?
-          command.params['notificationId'] = notification_id unless notification_id.nil?
+          command.params['roleAssignmentId'] = role_assignment_id unless role_assignment_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves a list of notifications.
+        # Retrieve a role assignment.
         # @param [String] customer
-        #   The unique ID for the customer's Google account.
-        # @param [String] language
-        #   The ISO 639-1 code of the language notifications are returned in. The default
-        #   is English (en).
-        # @param [Fixnum] max_results
-        #   Maximum number of notifications to return per page. The default is 100.
-        # @param [String] page_token
-        #   The token to specify the page of results to retrieve.
+        #   Immutable ID of the Google Apps account.
+        # @param [String] role_assignment_id
+        #   Immutable ID of the role assignment.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1264,35 +2312,30 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notifications] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::RoleAssignment] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Notifications]
+        # @return [Google::Apis::AdminDirectoryV1::RoleAssignment]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_notifications(customer, language: nil, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customer}/notifications'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::Notifications::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Notifications
+        def get_role_assignment(customer, role_assignment_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/roleassignments/{roleAssignmentId}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::RoleAssignment::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::RoleAssignment
           command.params['customer'] = customer unless customer.nil?
-          command.query['language'] = language unless language.nil?
-          command.query['maxResults'] = max_results unless max_results.nil?
-          command.query['pageToken'] = page_token unless page_token.nil?
+          command.params['roleAssignmentId'] = role_assignment_id unless role_assignment_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a notification. This method supports patch semantics.
+        # Creates a role assignment.
         # @param [String] customer
-        #   The unique ID for the customer's Google account.
-        # @param [String] notification_id
-        #   The unique ID of the notification.
-        # @param [Google::Apis::AdminDirectoryV1::Notification] notification_object
+        #   Immutable ID of the Google Apps account.
+        # @param [Google::Apis::AdminDirectoryV1::RoleAssignment] role_assignment_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1306,35 +2349,40 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notification] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::RoleAssignment] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Notification]
+        # @return [Google::Apis::AdminDirectoryV1::RoleAssignment]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_notification(customer, notification_id, notification_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customer}/notifications/{notificationId}'
-          command =  make_simple_command(:patch, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
-          command.request_object = notification_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Notification
+        def insert_role_assignment(customer, role_assignment_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'customer/{customer}/roleassignments', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::RoleAssignment::Representation
+          command.request_object = role_assignment_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::RoleAssignment::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::RoleAssignment
           command.params['customer'] = customer unless customer.nil?
-          command.params['notificationId'] = notification_id unless notification_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a notification.
+        # Retrieves a paginated list of all roleAssignments.
         # @param [String] customer
-        #   The unique ID for the customer's Google account.
-        # @param [String] notification_id
-        #   The unique ID of the notification.
-        # @param [Google::Apis::AdminDirectoryV1::Notification] notification_object
+        #   Immutable ID of the Google Apps account.
+        # @param [Fixnum] max_results
+        #   Maximum number of results to return.
+        # @param [String] page_token
+        #   Token to specify the next page in the list.
+        # @param [String] role_id
+        #   Immutable ID of a role. If included in the request, returns only role
+        #   assignments containing this role ID.
+        # @param [String] user_key
+        #   The user's primary email address, alias email address, or unique user ID. If
+        #   included in the request, returns role assignments only for this user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1348,34 +2396,34 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::Notification] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::RoleAssignments] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::Notification]
+        # @return [Google::Apis::AdminDirectoryV1::RoleAssignments]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_notification(customer, notification_id, notification_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customer}/notifications/{notificationId}'
-          command =  make_simple_command(:put, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
-          command.request_object = notification_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::Notification::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::Notification
+        def list_role_assignments(customer, max_results: nil, page_token: nil, role_id: nil, user_key: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/roleassignments', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::RoleAssignments::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::RoleAssignments
           command.params['customer'] = customer unless customer.nil?
-          command.params['notificationId'] = notification_id unless notification_id.nil?
+          command.query['maxResults'] = max_results unless max_results.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
+          command.query['roleId'] = role_id unless role_id.nil?
+          command.query['userKey'] = user_key unless user_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Remove Organization Unit
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [Array<String>, String] org_unit_path
-        #   Full path of the organization unit or its Id
+        # Deletes a role.
+        # @param [String] customer
+        #   Immutable ID of the Google Apps account.
+        # @param [String] role_id
+        #   Immutable ID of the role.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1397,22 +2445,21 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_org_unit(customer_id, org_unit_path, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/orgunits{/orgUnitPath*}'
-          command =  make_simple_command(:delete, path, options)
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+        def delete_role(customer, role_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:delete, 'customer/{customer}/roles/{roleId}', options)
+          command.params['customer'] = customer unless customer.nil?
+          command.params['roleId'] = role_id unless role_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve Organization Unit
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [Array<String>, String] org_unit_path
-        #   Full path of the organization unit or its Id
+        # Retrieves a role.
+        # @param [String] customer
+        #   Immutable ID of the Google Apps account.
+        # @param [String] role_id
+        #   Immutable ID of the role.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1426,31 +2473,30 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Role] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        # @return [Google::Apis::AdminDirectoryV1::Role]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_org_unit(customer_id, org_unit_path, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/orgunits{/orgUnitPath*}'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+        def get_role(customer, role_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/roles/{roleId}', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Role::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Role
+          command.params['customer'] = customer unless customer.nil?
+          command.params['roleId'] = role_id unless role_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Add Organization Unit
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [Google::Apis::AdminDirectoryV1::OrgUnit] org_unit_object
+        # Creates a role.
+        # @param [String] customer
+        #   Immutable ID of the Google Apps account.
+        # @param [Google::Apis::AdminDirectoryV1::Role] role_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1464,35 +2510,34 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Role] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        # @return [Google::Apis::AdminDirectoryV1::Role]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_org_unit(customer_id, org_unit_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/orgunits'
-          command =  make_simple_command(:post, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
-          command.request_object = org_unit_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
-          command.params['customerId'] = customer_id unless customer_id.nil?
+        def insert_role(customer, role_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'customer/{customer}/roles', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Role::Representation
+          command.request_object = role_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Role::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Role
+          command.params['customer'] = customer unless customer.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieve all Organization Units
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [String] org_unit_path
-        #   the URL-encoded organization unit's path or its Id
-        # @param [String] type
-        #   Whether to return all sub-organizations or just immediate children
+        # Retrieves a paginated list of all the roles in a domain.
+        # @param [String] customer
+        #   Immutable id of the Google Apps account.
+        # @param [Fixnum] max_results
+        #   Maximum number of results to return.
+        # @param [String] page_token
+        #   Token to specify the next page in the list.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1506,34 +2551,33 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnits] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Roles] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::OrgUnits]
+        # @return [Google::Apis::AdminDirectoryV1::Roles]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_org_units(customer_id, org_unit_path: nil, type: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/orgunits'
-          command =  make_simple_command(:get, path, options)
-          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnits::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnits
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.query['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
-          command.query['type'] = type unless type.nil?
+        def list_roles(customer, max_results: nil, page_token: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:get, 'customer/{customer}/roles', options)
+          command.response_representation = Google::Apis::AdminDirectoryV1::Roles::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Roles
+          command.params['customer'] = customer unless customer.nil?
+          command.query['maxResults'] = max_results unless max_results.nil?
+          command.query['pageToken'] = page_token unless page_token.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update Organization Unit. This method supports patch semantics.
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [Array<String>, String] org_unit_path
-        #   Full path of the organization unit or its Id
-        # @param [Google::Apis::AdminDirectoryV1::OrgUnit] org_unit_object
+        # Updates a role. This method supports patch semantics.
+        # @param [String] customer
+        #   Immutable ID of the Google Apps account.
+        # @param [String] role_id
+        #   Immutable ID of the role.
+        # @param [Google::Apis::AdminDirectoryV1::Role] role_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1547,35 +2591,34 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Role] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        # @return [Google::Apis::AdminDirectoryV1::Role]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_org_unit(customer_id, org_unit_path, org_unit_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/orgunits{/orgUnitPath*}'
-          command =  make_simple_command(:patch, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
-          command.request_object = org_unit_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+        def patch_role(customer, role_id, role_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:patch, 'customer/{customer}/roles/{roleId}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Role::Representation
+          command.request_object = role_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Role::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Role
+          command.params['customer'] = customer unless customer.nil?
+          command.params['roleId'] = role_id unless role_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Update Organization Unit
-        # @param [String] customer_id
-        #   Immutable id of the Google Apps account
-        # @param [Array<String>, String] org_unit_path
-        #   Full path of the organization unit or its Id
-        # @param [Google::Apis::AdminDirectoryV1::OrgUnit] org_unit_object
+        # Updates a role.
+        # @param [String] customer
+        #   Immutable ID of the Google Apps account.
+        # @param [String] role_id
+        #   Immutable ID of the role.
+        # @param [Google::Apis::AdminDirectoryV1::Role] role_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -1589,23 +2632,22 @@ module Google
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
-        # @yieldparam result [Google::Apis::AdminDirectoryV1::OrgUnit] parsed result object
+        # @yieldparam result [Google::Apis::AdminDirectoryV1::Role] parsed result object
         # @yieldparam err [StandardError] error object if request failed
         #
-        # @return [Google::Apis::AdminDirectoryV1::OrgUnit]
+        # @return [Google::Apis::AdminDirectoryV1::Role]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_org_unit(customer_id, org_unit_path, org_unit_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/orgunits{/orgUnitPath*}'
-          command =  make_simple_command(:put, path, options)
-          command.request_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
-          command.request_object = org_unit_object
-          command.response_representation = Google::Apis::AdminDirectoryV1::OrgUnit::Representation
-          command.response_class = Google::Apis::AdminDirectoryV1::OrgUnit
-          command.params['customerId'] = customer_id unless customer_id.nil?
-          command.params['orgUnitPath'] = org_unit_path unless org_unit_path.nil?
+        def update_role(customer, role_id, role_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:put, 'customer/{customer}/roles/{roleId}', options)
+          command.request_representation = Google::Apis::AdminDirectoryV1::Role::Representation
+          command.request_object = role_object
+          command.response_representation = Google::Apis::AdminDirectoryV1::Role::Representation
+          command.response_class = Google::Apis::AdminDirectoryV1::Role
+          command.params['customer'] = customer unless customer.nil?
+          command.params['roleId'] = role_id unless role_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
           command.query['userIp'] = user_ip unless user_ip.nil?
@@ -1639,8 +2681,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def delete_schema(customer_id, schema_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/schemas/{schemaKey}'
-          command =  make_simple_command(:delete, path, options)
+          command =  make_simple_command(:delete, 'customer/{customerId}/schemas/{schemaKey}', options)
           command.params['customerId'] = customer_id unless customer_id.nil?
           command.params['schemaKey'] = schema_key unless schema_key.nil?
           command.query['fields'] = fields unless fields.nil?
@@ -1676,8 +2717,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def get_schema(customer_id, schema_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/schemas/{schemaKey}'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'customer/{customerId}/schemas/{schemaKey}', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Schema::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Schema
           command.params['customerId'] = customer_id unless customer_id.nil?
@@ -1714,8 +2754,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def insert_schema(customer_id, schema_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/schemas'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'customer/{customerId}/schemas', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::Schema::Representation
           command.request_object = schema_object
           command.response_representation = Google::Apis::AdminDirectoryV1::Schema::Representation
@@ -1752,8 +2791,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def list_schemas(customer_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/schemas'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'customer/{customerId}/schemas', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Schemas::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Schemas
           command.params['customerId'] = customer_id unless customer_id.nil?
@@ -1791,8 +2829,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def patch_schema(customer_id, schema_key, schema_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/schemas/{schemaKey}'
-          command =  make_simple_command(:patch, path, options)
+          command =  make_simple_command(:patch, 'customer/{customerId}/schemas/{schemaKey}', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::Schema::Representation
           command.request_object = schema_object
           command.response_representation = Google::Apis::AdminDirectoryV1::Schema::Representation
@@ -1833,8 +2870,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def update_schema(customer_id, schema_key, schema_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'customer/{customerId}/schemas/{schemaKey}'
-          command =  make_simple_command(:put, path, options)
+          command =  make_simple_command(:put, 'customer/{customerId}/schemas/{schemaKey}', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::Schema::Representation
           command.request_object = schema_object
           command.response_representation = Google::Apis::AdminDirectoryV1::Schema::Representation
@@ -1875,8 +2911,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def delete_token(user_key, client_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/tokens/{clientId}'
-          command =  make_simple_command(:delete, path, options)
+          command =  make_simple_command(:delete, 'users/{userKey}/tokens/{clientId}', options)
           command.params['userKey'] = user_key unless user_key.nil?
           command.params['clientId'] = client_id unless client_id.nil?
           command.query['fields'] = fields unless fields.nil?
@@ -1913,8 +2948,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def get_token(user_key, client_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/tokens/{clientId}'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}/tokens/{clientId}', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Token::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Token
           command.params['userKey'] = user_key unless user_key.nil?
@@ -1951,8 +2985,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def list_tokens(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/tokens'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}/tokens', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Tokens::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Tokens
           command.params['userKey'] = user_key unless user_key.nil?
@@ -1987,8 +3020,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def delete_user(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}'
-          command =  make_simple_command(:delete, path, options)
+          command =  make_simple_command(:delete, 'users/{userKey}', options)
           command.params['userKey'] = user_key unless user_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
@@ -2028,8 +3060,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def get_user(user_key, custom_field_mask: nil, projection: nil, view_type: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::User::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::User
           command.params['userKey'] = user_key unless user_key.nil?
@@ -2066,8 +3097,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def insert_user(user_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'users', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::User::Representation
           command.request_object = user_object
           command.response_representation = Google::Apis::AdminDirectoryV1::User::Representation
@@ -2129,8 +3159,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def list_users(custom_field_mask: nil, customer: nil, domain: nil, event: nil, max_results: nil, order_by: nil, page_token: nil, projection: nil, query: nil, show_deleted: nil, sort_order: nil, view_type: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Users::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Users
           command.query['customFieldMask'] = custom_field_mask unless custom_field_mask.nil?
@@ -2176,9 +3205,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def make_admin_user(user_key, user_make_admin_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/makeAdmin'
-          command =  make_simple_command(:post, path, options)
+        def make_user_admin(user_key, user_make_admin_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, 'users/{userKey}/makeAdmin', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::UserMakeAdmin::Representation
           command.request_object = user_make_admin_object
           command.params['userKey'] = user_key unless user_key.nil?
@@ -2215,8 +3243,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def patch_user(user_key, user_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}'
-          command =  make_simple_command(:patch, path, options)
+          command =  make_simple_command(:patch, 'users/{userKey}', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::User::Representation
           command.request_object = user_object
           command.response_representation = Google::Apis::AdminDirectoryV1::User::Representation
@@ -2254,8 +3281,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def undelete_user(user_key, user_undelete_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/undelete'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'users/{userKey}/undelete', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::UserUndelete::Representation
           command.request_object = user_undelete_object
           command.params['userKey'] = user_key unless user_key.nil?
@@ -2292,8 +3318,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def update_user(user_key, user_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}'
-          command =  make_simple_command(:put, path, options)
+          command =  make_simple_command(:put, 'users/{userKey}', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::User::Representation
           command.request_object = user_object
           command.response_representation = Google::Apis::AdminDirectoryV1::User::Representation
@@ -2357,8 +3382,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def watch_user(channel_object = nil, custom_field_mask: nil, customer: nil, domain: nil, event: nil, max_results: nil, order_by: nil, page_token: nil, projection: nil, query: nil, show_deleted: nil, sort_order: nil, view_type: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/watch'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'users/watch', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::Channel::Representation
           command.request_object = channel_object
           command.response_representation = Google::Apis::AdminDirectoryV1::Channel::Representation
@@ -2408,8 +3432,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def delete_user_alias(user_key, user_alias, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/aliases/{alias}'
-          command =  make_simple_command(:delete, path, options)
+          command =  make_simple_command(:delete, 'users/{userKey}/aliases/{alias}', options)
           command.params['userKey'] = user_key unless user_key.nil?
           command.params['alias'] = user_alias unless user_alias.nil?
           command.query['fields'] = fields unless fields.nil?
@@ -2444,8 +3467,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def insert_user_alias(user_key, alias_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/aliases'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'users/{userKey}/aliases', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::Alias::Representation
           command.request_object = alias_object
           command.response_representation = Google::Apis::AdminDirectoryV1::Alias::Representation
@@ -2484,8 +3506,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def list_user_aliases(user_key, event: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/aliases'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}/aliases', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::Aliases::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::Aliases
           command.params['userKey'] = user_key unless user_key.nil?
@@ -2524,8 +3545,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def watch_user_alias(user_key, channel_object = nil, event: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/aliases/watch'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'users/{userKey}/aliases/watch', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::Channel::Representation
           command.request_object = channel_object
           command.response_representation = Google::Apis::AdminDirectoryV1::Channel::Representation
@@ -2563,8 +3583,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def delete_user_photo(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/photos/thumbnail'
-          command =  make_simple_command(:delete, path, options)
+          command =  make_simple_command(:delete, 'users/{userKey}/photos/thumbnail', options)
           command.params['userKey'] = user_key unless user_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
@@ -2597,8 +3616,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def get_user_photo(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/photos/thumbnail'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}/photos/thumbnail', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::UserPhoto::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::UserPhoto
           command.params['userKey'] = user_key unless user_key.nil?
@@ -2634,8 +3652,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def patch_user_photo(user_key, user_photo_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/photos/thumbnail'
-          command =  make_simple_command(:patch, path, options)
+          command =  make_simple_command(:patch, 'users/{userKey}/photos/thumbnail', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::UserPhoto::Representation
           command.request_object = user_photo_object
           command.response_representation = Google::Apis::AdminDirectoryV1::UserPhoto::Representation
@@ -2673,8 +3690,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def update_user_photo(user_key, user_photo_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/photos/thumbnail'
-          command =  make_simple_command(:put, path, options)
+          command =  make_simple_command(:put, 'users/{userKey}/photos/thumbnail', options)
           command.request_representation = Google::Apis::AdminDirectoryV1::UserPhoto::Representation
           command.request_object = user_photo_object
           command.response_representation = Google::Apis::AdminDirectoryV1::UserPhoto::Representation
@@ -2711,8 +3727,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def generate_verification_code(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/verificationCodes/generate'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'users/{userKey}/verificationCodes/generate', options)
           command.params['userKey'] = user_key unless user_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
@@ -2745,8 +3760,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def invalidate_verification_code(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/verificationCodes/invalidate'
-          command =  make_simple_command(:post, path, options)
+          command =  make_simple_command(:post, 'users/{userKey}/verificationCodes/invalidate', options)
           command.params['userKey'] = user_key unless user_key.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
@@ -2781,8 +3795,7 @@ module Google
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
         def list_verification_codes(user_key, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
-          path = 'users/{userKey}/verificationCodes'
-          command =  make_simple_command(:get, path, options)
+          command =  make_simple_command(:get, 'users/{userKey}/verificationCodes', options)
           command.response_representation = Google::Apis::AdminDirectoryV1::VerificationCodes::Representation
           command.response_class = Google::Apis::AdminDirectoryV1::VerificationCodes
           command.params['userKey'] = user_key unless user_key.nil?