Merge pull request #184 from alanquillin/FixIssueWithGetAllUsersByRole

Fixed issue with List Roles method and updated docs for Get All Users By Role

Author: alanquillin

src/corelib/Providers/Rackspace/CloudIdentityProvider.cs

@@ -122,23 +122,23 @@ public CloudIdentityProvider(CloudIdentity defaultIdentity, IRestService restSer
         }
 
         /// <inheritdoc/>
-        public IEnumerable<Role> ListRoles(string serviceId = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+        public IEnumerable<Role> ListRoles(string serviceId = null, int? marker = null, int? limit = null, CloudIdentity identity = null)
         {
             if (limit < 0)
                 throw new ArgumentOutOfRangeException("limit");
 
             var provider = GetProvider(identity);
-            return provider.ListRoles(serviceId, markerId, limit, identity);
+            return provider.ListRoles(serviceId, marker, limit, identity);
         }
 
         /// <inheritdoc/>
-        public IEnumerable<User> ListUsersByRole(string roleId, bool? enabled = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+        public IEnumerable<User> ListUsersByRole(string roleId, bool? enabled = null, int? marker = null, int? limit = null, CloudIdentity identity = null)
         {
             if (limit < 0 || limit > 1000)
                 throw new ArgumentOutOfRangeException("limit");
 
             var provider = GetProvider(identity);
-            return provider.ListUsersByRole(roleId, enabled, markerId, limit, identity);
+            return provider.ListUsersByRole(roleId, enabled, marker, limit, identity);
         }
 
         /// <inheritdoc/>

src/corelib/Providers/Rackspace/GeographicalCloudIdentityProvider.cs

@@ -36,7 +36,7 @@ public GeographicalCloudIdentityProvider(Uri urlBase, CloudIdentity identity, IR
         #region Roles
 
         /// <inheritdoc/>
-        public IEnumerable<Role> ListRoles(string serviceId = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+        public IEnumerable<Role> ListRoles(string serviceId = null, int? marker = null, int? limit = null, CloudIdentity identity = null)
         {
             if (limit < 0)
                 throw new ArgumentOutOfRangeException("limit");
@@ -45,7 +45,7 @@ public IEnumerable<Role> ListRoles(string serviceId = null, string markerId = nu
             var parameters = BuildOptionalParameterList(new Dictionary<string, string>
                 {
                     {"serviceId", serviceId},
-                    {"marker", markerId},
+                    {"marker", !marker.HasValue ? null : marker.Value.ToString()},
                     {"limit", !limit.HasValue ? null : limit.Value.ToString()},
                 });
 
@@ -156,7 +156,7 @@ public bool DeleteRoleFromUser(string userId, string roleId, CloudIdentity ident
         }
 
         /// <inheritdoc/>
-        public IEnumerable<User> ListUsersByRole(string roleId, bool? enabled = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+        public IEnumerable<User> ListUsersByRole(string roleId, bool? enabled = null, int? marker = null, int? limit = null, CloudIdentity identity = null)
         {
             if (limit < 0 || limit > 1000)
                 throw new ArgumentOutOfRangeException("limit");
@@ -166,7 +166,7 @@ public IEnumerable<User> ListUsersByRole(string roleId, bool? enabled = null, st
             var parameters = BuildOptionalParameterList(new Dictionary<string, string>
                 {
                     {"enabled", !enabled.HasValue ? null : enabled.Value ? "true" : "false"},
-                    {"marker", markerId},
+                    {"marker", !marker.HasValue ? null : marker.Value.ToString()},
                     {"limit", !limit.HasValue ? null : limit.Value.ToString()},
                 });
 

src/corelib/Providers/Rackspace/IExtendedCloudIdentityProvider.cs

@@ -19,7 +19,7 @@ public interface IExtendedCloudIdentityProvider : IIdentityProvider
         /// <note type="warning">The behavior of this API method is not defined. Do not use.</note>
         /// </summary>
         /// <param name="serviceId">The "serviceId".</param>
-        /// <param name="markerId">The <see cref="Role.Id"/> of the last item in the previous list. Used for pagination. If the value is <c>null</c>, the list starts at the beginning.</param>
+        /// <param name="marker">The index of the last item in the previous list. Used for pagination. If the value is <c>null</c>, the list starts at the beginning.</param>
         /// <param name="limit">Indicates the maximum number of items to return. Used for pagination. If the value is <c>null</c>, a provider-specific default value is used.</param>
         /// <param name="identity">The cloud identity to use for this request. If not specified, the default identity for the current provider instance will be used.</param>
         /// <returns>A collection of <see cref="Role"/> objects describing the requested roles.</returns>
@@ -28,23 +28,22 @@ public interface IExtendedCloudIdentityProvider : IIdentityProvider
         /// <exception cref="InvalidOperationException">If <paramref name="identity"/> is <c>null</c> and no default identity is available for the provider.</exception>
         /// <exception cref="ResponseException">If the REST API request failed.</exception>
         /// <seealso href="http://docs.rackspace.com/openstack-extensions/auth/OS-KSADM-admin-devguide/content/GET_listRoles_v2.0_OS-KSADM_roles_Admin_API_Service_Developer_Operations-d1e1357.html">List Roles (Rackspace OS-KSADM Extension - API v2.0)</seealso>
-        IEnumerable<Role> ListRoles(string serviceId = null, string markerId = null, int? limit = null, CloudIdentity identity = null);
+        IEnumerable<Role> ListRoles(string serviceId = null, int? marker = null, int? limit = null, CloudIdentity identity = null);
 
         /// <summary>
-        /// Lists all roles.
-        /// <note type="warning">The behavior of this API method is not defined. Do not use.</note>
+        /// Lists all users for a given role.
         /// </summary>
         /// <param name="roleId">The role ID. The behavior is unspecified if this is not obtained from <see cref="Role.Id"/>.</param>
         /// <param name="enabled">Allows you to filter enabled or un-enabled users. If the value is <c>null</c>, a provider-specific default value is used.</param>
-        /// <param name="markerId">The <see cref="Role.Id"/> of the last item in the previous list. Used for pagination. If the value is <c>null</c>, the list starts at the beginning.</param>
+        /// <param name="marker">The index of the last item in the previous list. Used for pagination. If the value is <c>null</c>, the list starts at the beginning.</param>
         /// <param name="limit">Indicates the maximum number of items to return. Used for pagination. If the value is <c>null</c>, a provider-specific default value is used.</param>
         /// <param name="identity">The cloud identity to use for this request. If not specified, the default identity for the current provider instance will be used.</param>
         /// <returns>A collection of <see cref="Role"/> objects describing the requested roles.</returns>
         /// <exception cref="ArgumentOutOfRangeException">If <paramref name="limit"/> is less than 0 or greater than 1000.</exception>
         /// <exception cref="NotSupportedException">If the provider does not support the given <paramref name="identity"/> type.</exception>
         /// <exception cref="InvalidOperationException">If <paramref name="identity"/> is <c>null</c> and no default identity is available for the provider.</exception>
         /// <exception cref="ResponseException">If the REST API request failed.</exception>
-        IEnumerable<User> ListUsersByRole(string roleId, bool? enabled = null, string markerId = null, int? limit = null, CloudIdentity identity = null);
+        IEnumerable<User> ListUsersByRole(string roleId, bool? enabled = null, int? marker = null, int? limit = null, CloudIdentity identity = null);
 
         /// <summary>
         /// Create a new role.