TrueCloudLab/frostfs-sdk-csharp
20
1
Fork 5
Code Issues 3 Pull requests Projects Releases Packages 3 Activity Actions

[#18] Client: Rename parameters
All checks were successful
DCO / DCO (pull_request) Successful in 43s
Details

Browse source 
Signed-off-by: Pavel Gross <p.gross@yando.com>
This commit is contained in:
Pavel Gross 2024-07-25 12:28:38 +03:00
parent 816e1eb2f1
commit 3206abc33e
31 changed files with 200 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/FrostFS.SDK.Tests/ContainerTest.cs
View file

@ -52,7 +52,7 @@ public class ContainerTest : ContainerTestsBase
[Fact]
public async void CreateContainerTest()
{
var param = new PrmCreateContainer(new ModelsV2.Container(BasicAcl.PublicRW, Mocker.PlacementPolicy));
var param = new PrmContainerCreate(new ModelsV2.Container(BasicAcl.PublicRW, Mocker.PlacementPolicy));
var result = await GetClient().CreateContainerAsync(param);
@ -68,7 +68,7 @@ public class ContainerTest : ContainerTestsBase
Mocker.Acl = BasicAcl.PublicRO;
var result = await GetClient().GetContainerAsync(new PrmGetContainer(cid));
var result = await GetClient().GetContainerAsync(new PrmContainerGet(cid));
Assert.NotNull(result);
Assert.Equal(Mocker.Acl, result.BasicAcl);
@ -104,7 +104,7 @@ public class ContainerTest : ContainerTestsBase
Mocker.ReturnContainerRemoved = true;
var cid = new ContainerId(Base58.Encode(Mocker.ContainerGuid.ToBytes()));
await GetClient().DeleteContainerAsync(new PrmDeleteContainer(cid));
await GetClient().DeleteContainerAsync(new PrmContainerDelete(cid));
Assert.Single(Mocker.Requests);

10
src/FrostFS.SDK.Tests/ObjectTest.cs
View file

@ -77,7 +77,7 @@ public class ObjectTest : ObjectTestsBase
Timeout = TimeSpan.FromSeconds(2)
};
var result = await client.GetObjectAsync(new PrmGetObject(ContainerId, objectId) { Context = context });
var result = await client.GetObjectAsync(new PrmObjectGet(ContainerId, objectId) { Context = context });
Assert.NotNull(result);
@ -98,7 +98,7 @@ public class ObjectTest : ObjectTestsBase
var bytes = new byte[1024];
rnd.NextBytes(bytes);
var param = new PrmPutObject
var param = new PrmObjectPut
{
Header = Mocker.ObjectHeader,
Payload = new MemoryStream(bytes),
@ -133,7 +133,7 @@ public class ObjectTest : ObjectTestsBase
byte[] bytes = File.ReadAllBytes(@".\..\..\..\TestData\cat.jpg");
var fileLength = bytes.Length;
var param = new PrmPutObject
var param = new PrmObjectPut
{
Header = Mocker.ObjectHeader,
Payload = new MemoryStream(bytes),
@ -197,7 +197,7 @@ public class ObjectTest : ObjectTestsBase
{
Mocker.ObjectId = new ObjectID { Value = ByteString.CopyFrom(SHA256.HashData(Encoding.UTF8.GetBytes("test"))) }.ToModel();
await GetClient().DeleteObjectAsync(new PrmDeleteObject(ContainerId, Mocker.ObjectId));
await GetClient().DeleteObjectAsync(new PrmObjectDelete(ContainerId, Mocker.ObjectId));
var request = Mocker.DeleteRequests.FirstOrDefault();
Assert.NotNull(request);
@ -210,7 +210,7 @@ public class ObjectTest : ObjectTestsBase
{
Mocker.ObjectId = new ObjectID { Value = ByteString.CopyFrom(SHA256.HashData(Encoding.UTF8.GetBytes("test"))) }.ToModel();
var response = await GetClient().GetObjectHeadAsync(new PrmGetObjectHead(ContainerId, Mocker.ObjectId));
var response = await GetClient().GetObjectHeadAsync(new PrmObjectHeadGet(ContainerId, Mocker.ObjectId));
var request = Mocker.HeadRequests.FirstOrDefault();
Assert.NotNull(request);

57
src/FrostFS.SDK.Tests/SmokeTests.cs
View file

@ -18,9 +18,9 @@ namespace FrostFS.SDK.SmokeTests;
public class SmokeTests
{
private static PrmWait lightWait = new (100, 1);
private static readonly PrmWait lightWait = new (100, 1);
private readonly string key = "KwHDAJ66o8FoLBjVbjP2sWBmgBMGjt7Vv4boA7xQrBoAYBE397Aq";
private readonly string url = "http://172.29.238.97:8080";
private readonly string url = "http://172.23.32.4:8080";
[Fact]
public async void NetworkMapTest()
@ -74,7 +74,7 @@ public class SmokeTests
{
using var client = Client.GetInstance(GetOptions(this.key, this.url));
var token = await client.CreateSessionAsync(new PrmCreateSession(100));
var token = await client.CreateSessionAsync(new PrmSessionCreate(100));
var session = new Session.SessionToken().Deserialize(token.Token);
@ -100,9 +100,9 @@ public class SmokeTests
await Cleanup(client);
var token = await client.CreateSessionAsync(new PrmCreateSession(int.MaxValue));
var token = await client.CreateSessionAsync(new PrmSessionCreate(int.MaxValue));
var createContainerParam = new PrmCreateContainer(
var createContainerParam = new PrmContainerCreate(
new ModelsV2.Container(BasicAcl.PublicRW, new PlacementPolicy(true, new Replica(1))));
createContainerParam.XHeaders.Add("key1", "value1");
@ -111,7 +111,7 @@ public class SmokeTests
var bytes = GetRandomBytes(1024);
var param = new PrmPutObject
var param = new PrmObjectPut
{
Header = new ObjectHeader(
containerId: containerId,
@ -124,7 +124,7 @@ public class SmokeTests
var objectId = await client.PutObjectAsync(param);
var @object = await client.GetObjectAsync(new PrmGetObject(containerId, objectId));
var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId));
var downloadedBytes = new byte[@object.Header.PayloadLength];
MemoryStream ms = new(downloadedBytes);
@ -161,7 +161,7 @@ public class SmokeTests
})
};
var createContainerParam = new PrmCreateContainer(
var createContainerParam = new PrmContainerCreate(
new ModelsV2.Container(BasicAcl.PublicRW, new PlacementPolicy(true, new Replica(1))))
{
Context = ctx
@ -169,13 +169,13 @@ public class SmokeTests
var containerId = await client.CreateContainerAsync(createContainerParam);
var container = await client.GetContainerAsync(new PrmGetContainer(containerId,ctx));
var container = await client.GetContainerAsync(new PrmContainerGet(containerId,ctx));
Assert.NotNull(container);
Assert.True(callbackInvoked);
var bytes = GetRandomBytes(objectSize);
var param = new PrmPutObject
var param = new PrmObjectPut
{
Header = new ObjectHeader(
containerId: containerId,
@ -194,11 +194,11 @@ public class SmokeTests
var filter = new ObjectFilter(ObjectMatchType.Equals, "fileName", "test");
bool hasObject = false;
await foreach (var objId in client.SearchObjectsAsync(new PrmSearchObject(containerId) { Filters = [filter] }))
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId) { Filters = [filter] }))
{
hasObject = true;
var objHeader = await client.GetObjectHeadAsync(new PrmGetObjectHead(containerId, objectId));
var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId));
Assert.Equal((ulong)bytes.Length, objHeader.PayloadLength);
Assert.Single(objHeader.Attributes);
Assert.Equal("fileName", objHeader.Attributes.First().Key);
@ -207,7 +207,7 @@ public class SmokeTests
Assert.True(hasObject);
var @object = await client.GetObjectAsync(new PrmGetObject(containerId, objectId));
var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId));
var downloadedBytes = new byte[@object.Header.PayloadLength];
MemoryStream ms = new(downloadedBytes);
@ -236,7 +236,7 @@ public class SmokeTests
{
using var client = Client.GetInstance(GetOptions(this.key, this.url));
var token = await client.CreateSessionAsync(new PrmCreateSession(int.MaxValue));
var token = await client.CreateSessionAsync(new PrmSessionCreate(int.MaxValue));
await Cleanup(client);
@ -246,7 +246,7 @@ public class SmokeTests
Callback = new((CallStatistics cs) => Assert.True(cs.ElapsedMicroSeconds > 0))
};
var createContainerParam = new PrmCreateContainer(
var createContainerParam = new PrmContainerCreate(
new ModelsV2.Container(BasicAcl.PublicRW, new PlacementPolicy(true, new Replica(1))))
{
Context = ctx
@ -254,12 +254,12 @@ public class SmokeTests
var containerId = await client.CreateContainerAsync(createContainerParam);
var container = await client.GetContainerAsync(new PrmGetContainer(containerId,ctx));
var container = await client.GetContainerAsync(new PrmContainerGet(containerId,ctx));
Assert.NotNull(container);
var bytes = GetRandomBytes(objectSize);
var param = new PrmPutObject
var param = new PrmObjectPut
{
Header = new ObjectHeader(
containerId: containerId,
@ -279,11 +279,11 @@ public class SmokeTests
var filter = new ObjectFilter(ObjectMatchType.Equals, "fileName", "test");
bool hasObject = false;
await foreach (var objId in client.SearchObjectsAsync(new PrmSearchObject(containerId) { Filters = [filter], SessionToken = token }))
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId) { Filters = [filter], SessionToken = token }))
{
hasObject = true;
var objHeader = await client.GetObjectHeadAsync(new PrmGetObjectHead(containerId, objectId) { SessionToken = token });
var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId) { SessionToken = token });
Assert.Equal((ulong)bytes.Length, objHeader.PayloadLength);
Assert.Single(objHeader.Attributes);
Assert.Equal("fileName", objHeader.Attributes.First().Key);
@ -292,7 +292,7 @@ public class SmokeTests
Assert.True(hasObject);
var @object = await client.GetObjectAsync(new PrmGetObject(containerId, objectId) { SessionToken = token });
var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId) { SessionToken = token });
var downloadedBytes = new byte[@object.Header.PayloadLength];
MemoryStream ms = new(downloadedBytes);
@ -325,7 +325,7 @@ public class SmokeTests
await Cleanup(client);
var createContainerParam = new PrmCreateContainer(new ModelsV2.Container(BasicAcl.PublicRW, new PlacementPolicy(true, new Replica(1))))
var createContainerParam = new PrmContainerCreate(new ModelsV2.Container(BasicAcl.PublicRW, new PlacementPolicy(true, new Replica(1))))
{
WaitParams = lightWait
};
@ -338,13 +338,13 @@ public class SmokeTests
Interceptors = new([new MetricsInterceptor()])
};
var container = await client.GetContainerAsync(new PrmGetContainer(containerId, context));
var container = await client.GetContainerAsync(new PrmContainerGet(containerId, context));
Assert.NotNull(container);
byte[] bytes = GetRandomBytes(objectSize);
var param = new PrmPutObject
var param = new PrmObjectPut
{
Header = new ObjectHeader(
containerId: containerId,
@ -359,11 +359,11 @@ public class SmokeTests
var filter = new ObjectFilter(ObjectMatchType.Equals, "fileName", "test");
bool hasObject = false;
await foreach (var objId in client.SearchObjectsAsync(new PrmSearchObject(containerId, filter)))
await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, filter)))
{
hasObject = true;
var objHeader = await client.GetObjectHeadAsync(new PrmGetObjectHead(containerId, objectId));
var objHeader = await client.GetObjectHeadAsync(new PrmObjectHeadGet(containerId, objectId));
Assert.Equal((ulong)bytes.Length, objHeader.PayloadLength);
Assert.Single(objHeader.Attributes);
Assert.Equal("fileName", objHeader.Attributes.First().Key);
@ -372,7 +372,7 @@ public class SmokeTests
Assert.True(hasObject);
var @object = await client.GetObjectAsync(new PrmGetObject(containerId, objectId));
var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId));
var downloadedBytes = new byte[@object.Header.PayloadLength];
MemoryStream ms = new(downloadedBytes);
@ -425,7 +425,7 @@ public class SmokeTests
{
await foreach (var cid in client.ListContainersAsync())
{
await client.DeleteContainerAsync(new PrmDeleteContainer(cid) { WaitParams = lightWait });
await client.DeleteContainerAsync(new PrmContainerDelete(cid) { WaitParams = lightWait });
}
}
}
@ -457,7 +457,8 @@ public class MetricsInterceptor() : Interceptor
watch.Stop();
var elapsed = watch.ElapsedTicks * 1_000_000/Stopwatch.Frequency;
// Do somethins with call info
// var elapsed = watch.ElapsedTicks * 1_000_000/Stopwatch.Frequency;
return response;
}