Split protocol testing into separate ITs for zilla dump command #989

attilakreiner · 2024-04-30T17:51:43Z

Description

This change splits the zilla dump command testing into separate ITs per protocol, with k3po scripts used to drive the engine and produce the engine frames used to generate the packet capture, then a text-based comparison is used to make diffs more readable should an IT fail.

Fixes #958

This reverts commit 596b66e.

...and-dump/src/test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/DumpRule.java

...test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/GrpcServerStreamRpcIT.java

.../test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/Http1AuthorizationIT.java

...dump/src/test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/TsharkRunner.java

...and-dump/src/test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/DumpRule.java

...src/test/java/io/aklivity/zilla/runtime/command/dump/internal/airline/DumpCommandRunner.java

.../test/java/io/aklivity/zilla/runtime/engine/test/internal/k3po/ext/behavior/ZillaEngine.java

This reverts commit 2c805b9.

This reverts commit 5e95550.

jfallows

Looks like we are getting closer, just the remaining extension types to verify correct via tshark and zilla.lua dissector.

jfallows · 2024-05-21T17:59:51Z

incubator/command-dump/pom.xml

+            <exclude>**/keys</exclude>
+            <exclude>**/trust</exclude>


Suggested change

<exclude>**/keys</exclude>

<exclude>**/trust</exclude>

<exclude>src/test/democa/**/*</exclude>

jfallows · 2024-05-21T18:16:33Z

.../test/java/io/aklivity/zilla/runtime/engine/test/internal/k3po/ext/behavior/ZillaTarget.java

+        int offset,
+        int length)
+    {
+        boolean shouldWrite = channel.getConfig().hasWriteClosed() || !channel.engine.serverClosed().get();


The second part of this condition is effectively using a global variable on the engine as a whole which doesn't seem quite right.

What problem were we trying to solve with that? What breaks when it is removed?

jfallows · 2024-05-21T18:17:27Z

...ava/io/aklivity/zilla/runtime/engine/test/internal/k3po/ext/behavior/ZillaChannelConfig.java

+    void setWriteClosed(boolean timestamps);
+
+    boolean hasWriteClosed();


Suggested change

void setWriteClosed(boolean timestamps);

boolean hasWriteClosed();

void setCloseable(boolean closeable);

boolean isCloseable();

jfallows · 2024-05-21T18:18:15Z

...test/java/io/aklivity/zilla/runtime/engine/test/internal/k3po/ext/types/ZillaTypeSystem.java

@@ -46,6 +46,7 @@ public final class ZillaTypeSystem implements TypeSystemSpi
    public static final TypeInfo<Long> OPTION_AFFINITY = new TypeInfo<>("affinity", Long.class);
    public static final TypeInfo<Byte> OPTION_CAPABILITIES = new TypeInfo<>("capabilities", Byte.class);
    public static final TypeInfo<String> OPTION_TIMESTAMPS = new TypeInfo<>("timestamps", String.class);
+    public static final TypeInfo<String> OPTION_WRITE_CLOSED = new TypeInfo<>("writeClosed", String.class);


Suggested change

public static final TypeInfo<String> OPTION_WRITE_CLOSED = new TypeInfo<>("writeClosed", String.class);

public static final TypeInfo<String> OPTION_CLOSEABLE = new TypeInfo<>("closeable", String.class);

jfallows · 2024-05-21T18:18:32Z

...test/java/io/aklivity/zilla/runtime/engine/test/internal/k3po/ext/types/ZillaTypeSystem.java

@@ -95,6 +96,7 @@ public ZillaTypeSystem()
        acceptOptions.add(OPTION_ALIGNMENT);
        acceptOptions.add(OPTION_CAPABILITIES);
        acceptOptions.add(OPTION_TIMESTAMPS);
+        acceptOptions.add(OPTION_WRITE_CLOSED);


Suggested change

acceptOptions.add(OPTION_WRITE_CLOSED);

acceptOptions.add(OPTION_CLOSEABLE);

jfallows · 2024-05-21T18:18:43Z

...test/java/io/aklivity/zilla/runtime/engine/test/internal/k3po/ext/types/ZillaTypeSystem.java

@@ -114,6 +116,7 @@ public ZillaTypeSystem()
        connectOptions.add(OPTION_AFFINITY);
        connectOptions.add(OPTION_CAPABILITIES);
        connectOptions.add(OPTION_TIMESTAMPS);
+        connectOptions.add(OPTION_WRITE_CLOSED);


Suggested change

connectOptions.add(OPTION_WRITE_CLOSED);

connectOptions.add(OPTION_CLOSEABLE);

jfallows · 2024-05-21T18:19:21Z

...aklivity/zilla/runtime/engine/test/internal/k3po/ext/behavior/DefaultZillaChannelConfig.java

+    @Override
+    public void setWriteClosed(
+        boolean writeClosed)
+    {
+        this.writeClosed = writeClosed;
+    }
+
+    @Override
+    public boolean hasWriteClosed()
+    {
+        return writeClosed;
+    }
+


Suggested change

@Override

public void setWriteClosed(

boolean writeClosed)

{

this.writeClosed = writeClosed;

}

@Override

public boolean hasWriteClosed()

{

return writeClosed;

}

@Override

public void setCloseable(

boolean closeable)

{

this.closeable = closeable;

}

@Override

public boolean isCloseable()

{

return closeable;

}

jfallows · 2024-05-21T18:20:01Z

...aklivity/zilla/runtime/engine/test/internal/k3po/ext/behavior/DefaultZillaChannelConfig.java

+        else if (OPTION_WRITE_CLOSED.getName().equals(key))
+        {
+            setWriteClosed(Boolean.parseBoolean(Objects.toString(value, "false")));
+        }


Suggested change

else if (OPTION_WRITE_CLOSED.getName().equals(key))

{

setWriteClosed(Boolean.parseBoolean(Objects.toString(value, "false")));

}

else if (OPTION_CLOSEABLE.getName().equals(key))

{

setCloseable(Boolean.parseBoolean(Objects.toString(value, "false")));

}

jfallows · 2024-05-21T18:20:20Z

...aklivity/zilla/runtime/engine/test/internal/k3po/ext/behavior/DefaultZillaChannelConfig.java


    public DefaultZillaChannelConfig()
    {
        super();
        setBufferFactory(NATIVE_BUFFER_FACTORY);
        setTimestamps(true);
+        setWriteClosed(true);


Suggested change

setWriteClosed(true);

setClosable(true);

jfallows · 2024-05-21T18:20:30Z

...aklivity/zilla/runtime/engine/test/internal/k3po/ext/behavior/DefaultZillaChannelConfig.java

@@ -51,12 +52,14 @@ public class DefaultZillaChannelConfig extends DefaultChannelConfig implements Z
    private long affinity;
    private byte capabilities;
    private boolean timestamps;
+    private boolean writeClosed;


Suggested change

private boolean writeClosed;

private boolean closeable;

WIP

3311795

attilakreiner force-pushed the dump-test branch 5 times, most recently from ab250ab to 79d1ecb Compare May 2, 2024 11:52

attilakreiner added 2 commits May 2, 2024 13:53

rm old tests

9459823

WIP

96efda9

attilakreiner force-pushed the dump-test branch from 79d1ecb to 96efda9 Compare May 2, 2024 11:53

fix ephemeral

596b66e

attilakreiner changed the title ~~Dump test~~ Split protocol testing into separate ITs for zilla dump command May 6, 2024

attilakreiner marked this pull request as ready for review May 6, 2024 14:57

attilakreiner added 6 commits May 6, 2024 17:54

Revert "fix ephemeral"

77dacb9

This reverts commit 596b66e.

fix ephemeral in rpt's

ad27f69

Add command-dump.spec

75c0895

WIP timestamps

975cd4d

tmp rm zilla:timestamps

2c805b9

tmp hardcode timestamp to 0

5e95550

jfallows requested changes May 8, 2024

View reviewed changes

attilakreiner added 7 commits May 13, 2024 10:06

Revert "tmp rm zilla:timestamps"

4de338a

This reverts commit 2c805b9.

Revert "tmp hardcode timestamp to 0"

ef63644

This reverts commit 5e95550.

Merge branch 'develop' into dump-test

60a2583

application server accept timestamps

9f82137

fix 1

a2762ea

fix packages

4d74176

fix packages 2

625e178

jfallows reviewed May 13, 2024

View reviewed changes

attilakreiner added 3 commits May 14, 2024 10:25

fix pom

a3f50f7

Add sse test

b5b283a

Add ws test

a7a93fe

attilakreiner added 28 commits May 18, 2024 15:47

WIP kafka

6cfb14b

fix

59825e6

WIP tls

43b30e3

WIP sse

4618b68

WIP ws

61f48b3

WIP amqp

62fc037

cleanup 1

6a34466

cleanup 2

dc94b76

cleanup 3

eb3be2d

cleanup 4

8e5a4fd

WIP filesystem

6a35aab

cleanup 5

2d8163e

cleanup 6

d7852ad

fix LabelManager

33896d8

ignore tls net

a1559fc

fix snapshot

70fdb4b

revert snapshot

5770ba9

fix ZillaEngine

29667dc

Add writeClosed

92c376e

Add CustomFramesIT

9cec9dd

WIP TlsNetworkIT

d0a5320

fix

bdd1f85

Merge branch 'develop' into dump-test

bb7d1b5

fix LabelManager lastModifiedTime

87c661b

fix

55ac904

fix chkstyle

843e56f

WIP close streams in the scripts; omit writeClosed

17fbccd

revert writeClosed

927ad40

jfallows approved these changes May 22, 2024

View reviewed changes

jfallows merged commit 12b8c92 into aklivity:develop May 22, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split protocol testing into separate ITs for zilla dump command #989

Split protocol testing into separate ITs for zilla dump command #989

attilakreiner commented Apr 30, 2024 •

edited

Loading

jfallows left a comment

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

jfallows May 21, 2024

	<exclude>**/keys</exclude>
	<exclude>**/trust</exclude>
	<exclude>src/test/democa/*/</exclude>

		void setWriteClosed(boolean timestamps);

		boolean hasWriteClosed();

	public static final TypeInfo<String> OPTION_WRITE_CLOSED = new TypeInfo<>("writeClosed", String.class);
	public static final TypeInfo<String> OPTION_CLOSEABLE = new TypeInfo<>("closeable", String.class);

	acceptOptions.add(OPTION_WRITE_CLOSED);
	acceptOptions.add(OPTION_CLOSEABLE);

	connectOptions.add(OPTION_WRITE_CLOSED);
	connectOptions.add(OPTION_CLOSEABLE);

Split protocol testing into separate ITs for zilla dump command #989

Split protocol testing into separate ITs for zilla dump command #989

Conversation

attilakreiner commented Apr 30, 2024 • edited Loading

Description

jfallows left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

attilakreiner commented Apr 30, 2024 •

edited

Loading