diff --git a/go.mod b/go.mod index a4d712526..67e497a3e 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/google/gopacket v1.1.19 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/libp2p/go-reuseport v0.1.0 - github.com/omec-project/pfcpsim v0.1.0 + github.com/omec-project/pfcpsim v1.0.1 github.com/p4lang/p4runtime v1.3.0 github.com/prometheus/client_golang v1.11.1 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index e03be7526..1cd2ab94c 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/omec-project/pfcpsim v0.1.0 h1:bVns5jF9bZvleejQNNHBvzvA/PtQTBxUE0YnLS4XyXE= -github.com/omec-project/pfcpsim v0.1.0/go.mod h1:ELaB0bjuNv7TEWN0Nx+HX4yQx0uevmdw/3GM+Kny7Ko= +github.com/omec-project/pfcpsim v1.0.1 h1:UELAEHM9z7cZrni0Hl0uf+oHlZGcUiCKOUrARYl9LOE= +github.com/omec-project/pfcpsim v1.0.1/go.mod h1:KpZns0wcb+ZZRgaK1dPZG4MigtNMvxvTC6FA579cVyE= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= diff --git a/test/integration/basic_test.go b/test/integration/basic_test.go index 0e8e64df9..8f368ff4d 100644 --- a/test/integration/basic_test.go +++ b/test/integration/basic_test.go @@ -83,7 +83,7 @@ func TestUPFBasedUeIPAllocation(t *testing.T) { WithDownlinkIP(testcase.input.nbAddress).BuildFAR(), } - err := pfcpClient.SendSessionEstablishmentRequest(pdrs, fars, nil) + err := pfcpClient.SendSessionEstablishmentRequest(pdrs, fars, nil, nil) require.NoError(t, err) resp, err := pfcpClient.PeekNextResponse() @@ -161,7 +161,8 @@ func TestDetectUP4Restart(t *testing.T) { WithDownlinkMBR(500000). WithUplinkGBR(0). WithDownlinkGBR(0).Build(), - }) + }, + nil) } t.Run("Do not clear on UP4 restart", func(t *testing.T) { @@ -614,7 +615,7 @@ func testUEAttach(t *testing.T, testcase *testCase) { )) } - sess, err := pfcpClient.EstablishSession(pdrs, fars, qers) + sess, err := pfcpClient.EstablishSession(pdrs, fars, qers, nil) testcase.expected.pdrs = pdrs testcase.expected.fars = fars testcase.expected.qers = qers @@ -628,7 +629,7 @@ func testUEAttach(t *testing.T, testcase *testCase) { WithMethod(session.Update).WithID(2). WithAction(ActionForward).WithDstInterface(ie.DstInterfaceAccess). WithTEID(testcase.input.dlTEID).WithDownlinkIP(testcase.input.nbAddress).BuildFAR(), - }, nil) + }, nil, nil) verifyEntries(t, testcase.input, testcase.expected, UEStateAttached) } @@ -643,7 +644,7 @@ func testUEBuffer(t *testing.T, testcase *testCase) { WithDownlinkIP(testcase.input.nbAddress).BuildFAR(), } - err := pfcpClient.ModifySession(testcase.session, nil, fars, nil) + err := pfcpClient.ModifySession(testcase.session, nil, fars, nil, nil) require.NoError(t, err) verifyEntries(t, testcase.input, testcase.expected, UEStateBuffering) @@ -657,7 +658,7 @@ func testUEBuffer(t *testing.T, testcase *testCase) { WithDownlinkIP(testcase.input.nbAddress).BuildFAR(), } - err = pfcpClient.ModifySession(testcase.session, nil, fars, nil) + err = pfcpClient.ModifySession(testcase.session, nil, fars, nil, nil) require.NoError(t, err) verifyEntries(t, testcase.input, testcase.expected, UEStateAttached)