Refactor

README.md

@@ -6,23 +6,24 @@ Still a Work In Progress. API may change before v1.0.0.
 - PFCP Sessions handling (currently only PFCP Session establishment procedure is supported)
 
 ## Getting started
-### Server (UPF)
+### UPF
 
 ```golang
-upNode := NewPFCPServerEntity(upAddress)
+upNode := NewPFCPEntityUP(UPFADDR)
 upNode.Start()
+// Access list of associations
+associations := upNode.GetPFCPAssociations()
 // Access list of sessions
 sessions := upNode.GetPFCPSessions()
 ```
 
-### Client (SMF)
+### SMF
 
 ```golang
-cpNode := NewPFCPClientEntity(cpAddress)
+cpNode := NewPFCPEntityCP(SMFADDR)
 cpNode.Start()
-peer, _ := NewPFCPPeer(cpNode, pfcputils.CreateNodeID(nodeID)
-a, _ := cpNode.NewPFCPAssociation(peer)
-a.NewPFCPSession(cpNode.GetNextRemoteSessionID(), pdrs, fars)
+association, _ := cpNode.NewEstablishedAssociation(pfcputils.CreateNodeID(UPFADDR))
+session, _ := a.CreateSession(pdrs, fars)
 
 ```
 

pfcp/api/association_interface.go

@@ -0,0 +1,19 @@
+// Copyright 2022 Louis Royer and the go-pfcp-networking contributors. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+// SPDX-License-Identifier: MIT
+
+package api
+
+import (
+	pfcprule "github.com/louisroyer/go-pfcp-networking/pfcprules"
+	"github.com/wmnsk/go-pfcp/ie"
+)
+
+type SEID = uint64
+type PFCPAssociationInterface interface {
+	PFCPPeerInterface
+	SetupInitiatedByCP() error
+	GetNextSEID() SEID
+	CreateSession(remoteFseid *ie.IE, pdrs pfcprule.PDRs, fars pfcprule.FARs) (session PFCPSessionInterface, err error)
+}

pfcp/api/entity_interface.go

@@ -0,0 +1,26 @@
+// Copyright 2022 Louis Royer and the go-pfcp-networking contributors. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+// SPDX-License-Identifier: MIT
+
+package api
+
+import (
+	"net"
+
+	"github.com/wmnsk/go-pfcp/ie"
+)
+
+type PFCPEntityInterface interface {
+	IsUserPlane() bool
+	IsControlPlane() bool
+	NodeID() *ie.IE
+	RecoveryTimeStamp() *ie.IE
+	NewEstablishedPFCPAssociation(nodeID *ie.IE) (association PFCPAssociationInterface, err error)
+	RemovePFCPAssociation(association PFCPAssociationInterface) error
+	GetPFCPAssociation(nid string) (association PFCPAssociationInterface, err error)
+	//GetLocalSessions() PFCPSessionMapSEID
+	SendTo(msg []byte, dst net.Addr) error
+	GetPFCPSessions() []PFCPSessionInterface
+	AddEstablishedPFCPSession(session PFCPSessionInterface) error
+}

pfcp/api/peer_interface.go

@@ -0,0 +1,23 @@
+// Copyright 2022 Louis Royer and the go-pfcp-networking contributors. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+// SPDX-License-Identifier: MIT
+
+package api
+
+import (
+	"github.com/wmnsk/go-pfcp/ie"
+	"github.com/wmnsk/go-pfcp/message"
+)
+
+type PFCPPeerInterface interface {
+	IsRunning() bool
+	Close() error
+	Send(msg message.Message) (m message.Message, err error)
+	IsAlive() (res bool, err error)
+	NodeID() *ie.IE
+	IsUserPlane() bool
+	IsControlPlane() bool
+	LocalEntity() PFCPEntityInterface
+	NewEstablishedPFCPAssociation() (PFCPAssociationInterface, error)
+}

pfcp/api/session_interface.go

@@ -0,0 +1,27 @@
+// Copyright 2022 Louis Royer and the go-pfcp-networking contributors. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+// SPDX-License-Identifier: MIT
+
+package api
+
+import (
+	"net"
+
+	pfcprule "github.com/louisroyer/go-pfcp-networking/pfcprules"
+	"github.com/wmnsk/go-pfcp/ie"
+)
+
+type PFCPSessionInterface interface {
+	LocalFSEID() *ie.IE
+	LocalSEID() (SEID, error)
+	LocalIPAddress() (net.IP, error)
+	RemoteFSEID() *ie.IE
+	RemoteSEID() (SEID, error)
+	RemoteIPAddress() (net.IP, error)
+	GetPDRs() pfcprule.PDRs
+	GetFAR(farid uint32) (*pfcprule.FAR, error)
+	AddPDRsFARs(pdrs pfcprule.PDRMap, fars pfcprule.FARMap)
+	//	SetRemoteFSEID(FSEID *ie.IE)
+	Setup() error
+}