diff --git a/src/corelib/Providers/Rackspace/CloudIdentityProvider.cs b/src/corelib/Providers/Rackspace/CloudIdentityProvider.cs
index f4b77800d..6b801c79e 100644
--- a/src/corelib/Providers/Rackspace/CloudIdentityProvider.cs
+++ b/src/corelib/Providers/Rackspace/CloudIdentityProvider.cs
@@ -122,23 +122,23 @@ public CloudIdentityProvider(CloudIdentity defaultIdentity, IRestService restSer
}
///
- public IEnumerable ListRoles(string serviceId = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+ public IEnumerable 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);
}
///
- public IEnumerable ListUsersByRole(string roleId, bool? enabled = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+ public IEnumerable 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);
}
///
diff --git a/src/corelib/Providers/Rackspace/GeographicalCloudIdentityProvider.cs b/src/corelib/Providers/Rackspace/GeographicalCloudIdentityProvider.cs
index 90cce5863..e892611b0 100644
--- a/src/corelib/Providers/Rackspace/GeographicalCloudIdentityProvider.cs
+++ b/src/corelib/Providers/Rackspace/GeographicalCloudIdentityProvider.cs
@@ -36,7 +36,7 @@ public GeographicalCloudIdentityProvider(Uri urlBase, CloudIdentity identity, IR
#region Roles
///
- public IEnumerable ListRoles(string serviceId = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+ public IEnumerable 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 ListRoles(string serviceId = null, string markerId = nu
var parameters = BuildOptionalParameterList(new Dictionary
{
{"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
}
///
- public IEnumerable ListUsersByRole(string roleId, bool? enabled = null, string markerId = null, int? limit = null, CloudIdentity identity = null)
+ public IEnumerable 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 ListUsersByRole(string roleId, bool? enabled = null, st
var parameters = BuildOptionalParameterList(new Dictionary
{
{"enabled", !enabled.HasValue ? null : enabled.Value ? "true" : "false"},
- {"marker", markerId},
+ {"marker", !marker.HasValue ? null : marker.Value.ToString()},
{"limit", !limit.HasValue ? null : limit.Value.ToString()},
});
diff --git a/src/corelib/Providers/Rackspace/IExtendedCloudIdentityProvider.cs b/src/corelib/Providers/Rackspace/IExtendedCloudIdentityProvider.cs
index eca23e160..e96f8ab00 100644
--- a/src/corelib/Providers/Rackspace/IExtendedCloudIdentityProvider.cs
+++ b/src/corelib/Providers/Rackspace/IExtendedCloudIdentityProvider.cs
@@ -19,7 +19,7 @@ public interface IExtendedCloudIdentityProvider : IIdentityProvider
/// The behavior of this API method is not defined. Do not use.
///
/// The "serviceId".
- /// The of the last item in the previous list. Used for pagination. If the value is null, the list starts at the beginning.
+ /// The index of the last item in the previous list. Used for pagination. If the value is null, the list starts at the beginning.
/// Indicates the maximum number of items to return. Used for pagination. If the value is null, a provider-specific default value is used.
/// The cloud identity to use for this request. If not specified, the default identity for the current provider instance will be used.
/// A collection of objects describing the requested roles.
@@ -28,15 +28,14 @@ public interface IExtendedCloudIdentityProvider : IIdentityProvider
/// If is null and no default identity is available for the provider.
/// If the REST API request failed.
/// List Roles (Rackspace OS-KSADM Extension - API v2.0)
- IEnumerable ListRoles(string serviceId = null, string markerId = null, int? limit = null, CloudIdentity identity = null);
+ IEnumerable ListRoles(string serviceId = null, int? marker = null, int? limit = null, CloudIdentity identity = null);
///
- /// Lists all roles.
- /// The behavior of this API method is not defined. Do not use.
+ /// Lists all users for a given role.
///
/// The role ID. The behavior is unspecified if this is not obtained from .
/// Allows you to filter enabled or un-enabled users. If the value is null, a provider-specific default value is used.
- /// The of the last item in the previous list. Used for pagination. If the value is null, the list starts at the beginning.
+ /// The index of the last item in the previous list. Used for pagination. If the value is null, the list starts at the beginning.
/// Indicates the maximum number of items to return. Used for pagination. If the value is null, a provider-specific default value is used.
/// The cloud identity to use for this request. If not specified, the default identity for the current provider instance will be used.
/// A collection of objects describing the requested roles.
@@ -44,7 +43,7 @@ public interface IExtendedCloudIdentityProvider : IIdentityProvider
/// If the provider does not support the given type.
/// If is null and no default identity is available for the provider.
/// If the REST API request failed.
- IEnumerable ListUsersByRole(string roleId, bool? enabled = null, string markerId = null, int? limit = null, CloudIdentity identity = null);
+ IEnumerable ListUsersByRole(string roleId, bool? enabled = null, int? marker = null, int? limit = null, CloudIdentity identity = null);
///
/// Create a new role.