Skip to content

Commit 1b142b0

Browse files
committed
Remove os-volume-types endpoint, it never existed...
https://bugs.launchpad.net/openstack-api-site/+bug/1543169
1 parent 9f4513e commit 1b142b0

7 files changed

Lines changed: 3 additions & 125 deletions

File tree

src/corelib/Compute/v2_1/ComputeService.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,6 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
455455
return _computeApi.GetVolumeAsync<Volume>(volumeId, cancellationToken);
456456
}
457457

458-
/// <inheritdoc cref="ComputeApi.GetVolumeTypeAsync{T}" />
459-
public Task<VolumeType> GetVolumeTypeAsync(Identifier volumeTypeId, CancellationToken cancellationToken = default(CancellationToken))
460-
{
461-
return _computeApi.GetVolumeTypeAsync<VolumeType>(volumeTypeId, cancellationToken);
462-
}
463-
464458
/// <inheritdoc cref="ComputeApi.GetVolumeSnapshotAsync{T}" />
465459
public Task<VolumeSnapshot> GetVolumeSnapshotAsync(Identifier snapshotId, CancellationToken cancellationToken = default(CancellationToken))
466460
{
@@ -484,13 +478,7 @@ public ComputeService(IAuthenticationProvider authenticationProvider, string reg
484478
{
485479
return await _computeApi.ListVolumesAsync<VolumeCollection>(cancellationToken).ConfigureAwait(false);
486480
}
487-
488-
///// <inheritdoc cref="ComputeApiBuilder.ListVolumeTypesAsync{T}" />
489-
//public async Task<IEnumerable<VolumeType>> ListVolumeTypesAsync(CancellationToken cancellationToken = default(CancellationToken))
490-
//{
491-
// return await _computeApi.ListVolumeTypesAsync<VolumeTypeCollection>(cancellationToken);
492-
//}
493-
481+
494482
/// <inheritdoc cref="ComputeApi.ListVolumeSnapshotsAsync{T}" />
495483
public async Task<IEnumerable<VolumeSnapshot>> ListVolumeSnapshotsAsync(CancellationToken cancellationToken = default(CancellationToken))
496484
{

src/corelib/Compute/v2_1/ComputeServiceExtensions.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,6 @@ public static Volume GetVolume(this ComputeService service, Identifier volumeId)
433433
return service.GetVolumeAsync(volumeId).ForceSynchronous();
434434
}
435435

436-
/// <inheritdoc cref="ComputeService.GetVolumeTypeAsync" />
437-
public static VolumeType GetVolumeType(this ComputeService service, Identifier volumeTypeId)
438-
{
439-
return service.GetVolumeTypeAsync(volumeTypeId).ForceSynchronous();
440-
}
441-
442436
/// <inheritdoc cref="ComputeService.GetVolumeSnapshotAsync" />
443437
public static VolumeSnapshot GetVolumeSnapshot(this ComputeService service, Identifier snapshotId)
444438
{

src/corelib/Compute/v2_1/Serialization/ComputeApi.cs

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,34 +1755,7 @@ protected ComputeApi(IServiceType serviceType, IAuthenticationProvider authentic
17551755

17561756
return Endpoint.PrepareGetResourceRequest($"os-volumes/{volumeId}", cancellationToken);
17571757
}
1758-
1759-
/// <summary>
1760-
/// Shows details for a volume type.
1761-
/// </summary>
1762-
/// <typeparam name="T">The return type.</typeparam>
1763-
/// <param name="volumeTypeId">The volume type identifier.</param>
1764-
/// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
1765-
public virtual async Task<T> GetVolumeTypeAsync<T>(string volumeTypeId, CancellationToken cancellationToken = default(CancellationToken))
1766-
{
1767-
return await BuildGetVolumeTypeRequest(volumeTypeId, cancellationToken)
1768-
.SendAsync()
1769-
.ReceiveJson<T>().ConfigureAwait(false);
1770-
}
1771-
1772-
/// <summary>
1773-
/// Builds the <see cref="GetVolumeTypeAsync{T}"/> request.
1774-
/// </summary>
1775-
/// <param name="volumeTypeId">The volume type identifier.</param>
1776-
/// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
1777-
/// <exception cref="System.ArgumentNullException">volumeTypeId</exception>
1778-
public virtual Task<PreparedRequest> BuildGetVolumeTypeRequest(string volumeTypeId, CancellationToken cancellationToken = default(CancellationToken))
1779-
{
1780-
if (volumeTypeId == null)
1781-
throw new ArgumentNullException("volumeTypeId");
1782-
1783-
return Endpoint.PrepareGetResourceRequest($"os-volume-types/{volumeTypeId}", cancellationToken);
1784-
}
1785-
1758+
17861759
/// <summary>
17871760
/// Shows details for a volume snapshot.
17881761
/// </summary>
@@ -1892,19 +1865,7 @@ protected ComputeApi(IServiceType serviceType, IAuthenticationProvider authentic
18921865
{
18931866
return Endpoint.PrepareGetResourceRequest("os-volumes", cancellationToken);
18941867
}
1895-
1896-
//public virtual async Task<T> ListVolumeTypesAsync<T>(CancellationToken cancellationToken = default(CancellationToken))
1897-
//{
1898-
// return await BuildListVolumeTypesRequest(cancellationToken)
1899-
// .SendAsync()
1900-
// .ReceiveJson<T>();
1901-
//}
1902-
1903-
// //public virtual Task<PreparedRequest> BuildListVolumeTypesRequest(CancellationToken cancellationToken = default(CancellationToken))
1904-
//{
1905-
// return Endpoint.PrepareGetResourceRequest("os-volume-types", cancellationToken);
1906-
//}
1907-
1868+
19081869
/// <summary>
19091870
/// Lists volume snapshots.
19101871
/// </summary>

src/corelib/Compute/v2_1/Serialization/VolumeTypeCollection.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/corelib/Compute/v2_1/VolumeType.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/corelib/OpenStack.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
<Compile Include="Compute\v2_1\SecurityGroupExtensions.cs" />
128128
<Compile Include="Compute\v2_1\KeyPairExtensions.cs" />
129129
<Compile Include="Compute\v2_1\Serialization\VolumeSnapshotCollection.cs" />
130-
<Compile Include="Compute\v2_1\Serialization\VolumeTypeCollection.cs" />
131130
<Compile Include="Compute\v2_1\Serialization\VolumeCollection.cs" />
132131
<Compile Include="Compute\v2_1\ServerSummary.cs" />
133132
<Compile Include="Compute\v2_1\VolumeSnapshotExtensions.cs" />
@@ -178,7 +177,6 @@
178177
<Compile Include="Compute\v2_1\ServerVolumeReference.cs" />
179178
<Compile Include="Compute\v2_1\VolumeSnapshot.cs" />
180179
<Compile Include="Compute\v2_1\VolumeSnapshotDefinition.cs" />
181-
<Compile Include="Compute\v2_1\VolumeType.cs" />
182180
<Compile Include="Compute\v2_2\KeyPair.cs" />
183181
<Compile Include="Compute\v2_2\KeyPairDefinition.cs" />
184182
<Compile Include="Compute\v2_2\KeyPairType.cs" />

src/testing/unit/Compute/v2_1/VolumeTests.cs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,6 @@ public void GetVolume()
4545
}
4646
}
4747

48-
[Fact]
49-
public void GetVolumeType()
50-
{
51-
using (var httpTest = new HttpTest())
52-
{
53-
Identifier volumeTypeId = Guid.NewGuid();
54-
httpTest.RespondWithJson(new VolumeType { Id = volumeTypeId });
55-
56-
var result = _compute.GetVolumeType(volumeTypeId);
57-
58-
httpTest.ShouldHaveCalled($"*/os-volume-types/{volumeTypeId}");
59-
Assert.NotNull(result);
60-
Assert.Equal(volumeTypeId, result.Id);
61-
}
62-
}
63-
6448
[Fact]
6549
public void GetVolumeSnapshot()
6650
{

0 commit comments

Comments
 (0)