diff --git a/config/ran1.yaml b/config/ran1.yaml index 3af940b..02e26b0 100644 --- a/config/ran1.yaml +++ b/config/ran1.yaml @@ -1,82 +1,84 @@ +pfcp-address: "10.0.60.5" gtpu-entities: - "10.0.10.2" - - "fd00:d0cc:e700:1111:1::2" +# - "fd00:d0cc:e700:1111:1::2" simulate-ran: ipv4: "10.0.200.1/24" - ipv6: "fd00:d0cc:e700:2222:1::1/80" -pfcp-sessions: - - pdrs: - - id: 1 - precedence: 255 - pdi: - sourceInterface: "Access" - ue-ip-address: - ip-address: "10.0.200.1" - farid: 1 - - id: 2 - precedence: 255 - pdi: - sourceInterface: "Core" - fteid: - teid: 1 - ipAddress: "10.0.10.2" - farid: 2 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 61 - precedence: 255 - pdi: - sourceInterface: "Access" - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::1" - farid: 61 - - id: 62 - precedence: 255 - pdi: - sourceInterface: "Core" - fteid: - teid: 61 - ipAddress: "fd00:d0cc:e700:1111:1::2" - farid: 62 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 99 - precedence: 255 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fe80::/10 to any" - farid: 99 + ipv6: "" +# ipv6: "fd00:d0cc:e700:2222:1::1/80" +#pfcp-sessions: +# - pdrs: +# - id: 1 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# ue-ip-address: +# ip-address: "10.0.200.1" +# farid: 1 +# - id: 2 +# precedence: 255 +# pdi: +# sourceInterface: "Core" +# fteid: +# teid: 1 +# ipAddress: "10.0.10.2" +# farid: 2 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 61 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::1" +# farid: 61 +# - id: 62 +# precedence: 255 +# pdi: +# sourceInterface: "Core" +# fteid: +# teid: 61 +# ipAddress: "fd00:d0cc:e700:1111:1::2" +# farid: 62 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 99 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fe80::/10 to any" +# farid: 99 - fars: - - id: 1 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 1 - gtpuPeer: "10.0.10.3" - - id: 2 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - - id: 61 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 61 - gtpuPeer: "fd00:d0cc:e700:1111:1::3" - - id: 62 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - - id: 99 - applyAction: - action: "Drop" +# fars: +# - id: 1 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 1 +# gtpuPeer: "10.0.10.3" +# - id: 2 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# - id: 61 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 61 +# gtpuPeer: "fd00:d0cc:e700:1111:1::3" +# - id: 62 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# - id: 99 +# applyAction: +# action: "Drop" diff --git a/config/ran2.yaml b/config/ran2.yaml index 2a7c8d0..2eb3e0a 100644 --- a/config/ran2.yaml +++ b/config/ran2.yaml @@ -1,81 +1,83 @@ +pfcp-address: "10.0.60.6" gtpu-entities: - "10.0.10.4" - - "fd00:d0cc:e700:1111:1::4" +# - "fd00:d0cc:e700:1111:1::4" simulate-ran: ipv4: "10.0.200.2/24" - ipv6: "fd00:d0cc:e700:2222:1::2/80" -pfcp-sessions: - - pdrs: - - id: 1 - precedence: 255 - pdi: - sourceInterface: "Access" - ue-ip-address: - ip-address: "10.0.200.2" - farid: 1 - - id: 2 - precedence: 255 - pdi: - sourceInterface: "Core" - fteid: - teid: 2 - ipAddress: "10.0.10.4" - farid: 2 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 61 - precedence: 255 - pdi: - sourceInterface: "Access" - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::2" - farid: 61 - - id: 62 - precedence: 255 - pdi: - sourceInterface: "Core" - fteid: - teid: 62 - ipAddress: "fd00:d0cc:e700:1111:1::4" - farid: 62 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 99 - precedence: 255 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fe80::/10 to any" - farid: 99 - fars: - - id: 1 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 2 - gtpuPeer: "10.0.10.3" - - id: 2 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - - id: 61 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 62 - gtpuPeer: "fd00:d0cc:e700:1111:1::3" - - id: 62 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - - id: 99 - applyAction: - action: "Drop" + ipv6: "" +# ipv6: "fd00:d0cc:e700:2222:1::2/80" +#pfcp-sessions: +# - pdrs: +# - id: 1 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# ue-ip-address: +# ip-address: "10.0.200.2" +# farid: 1 +# - id: 2 +# precedence: 255 +# pdi: +# sourceInterface: "Core" +# fteid: +# teid: 2 +# ipAddress: "10.0.10.4" +# farid: 2 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 61 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::2" +# farid: 61 +# - id: 62 +# precedence: 255 +# pdi: +# sourceInterface: "Core" +# fteid: +# teid: 62 +# ipAddress: "fd00:d0cc:e700:1111:1::4" +# farid: 62 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 99 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fe80::/10 to any" +# farid: 99 +# fars: +# - id: 1 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 2 +# gtpuPeer: "10.0.10.3" +# - id: 2 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# - id: 61 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 62 +# gtpuPeer: "fd00:d0cc:e700:1111:1::3" +# - id: 62 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# - id: 99 +# applyAction: +# action: "Drop" diff --git a/config/upf1.yaml b/config/upf1.yaml index 2f09f76..6307d0c 100644 --- a/config/upf1.yaml +++ b/config/upf1.yaml @@ -2,326 +2,326 @@ pfcp-address: "10.0.60.3" gtpu-entities: - "10.0.10.3" - "10.0.20.3" - - "fd00:d0cc:e700:1111:1::3" - - "fd00:d0cc:e700:1111:2::3" +# - "fd00:d0cc:e700:1111:1::3" +# - "fd00:d0cc:e700:1111:2::3" dnn_list: - dnn: "sliceA" cidr: "10.0.200.0/24" - - dnn: "sliceA" - cidr: "fd00:d0cc:e700:2222:1::/80" -pfcp-sessions: - - pdrs: - - id: 1 # To C-DN - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 1 - ipAddress: "10.0.10.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 1 - - id: 2 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from 10.0.200.1 to 10.0.50.0/24" - fteid: - teid: 1 - ipAddress: "10.0.10.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 2 - - id: 3 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from 10.0.200.1 to 10.0.200.0/24" - fteid: - teid: 1 - ipAddress: "10.0.10.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 2 - - id: 4 # From C-DN - precedence: 254 - pdi: - ue-ip-address: - ip-address: "10.0.200.1" - sourceInterface: "Core" - fteid: - teid: 1 - ipAddress: "10.0.20.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 3 - - id: 5 # From I-DN - precedence: 255 - pdi: - ue-ip-address: - ip-address: "10.0.200.1" - sourceInterface: "SGi-LAN/N6-LAN" - farid: 3 - - id: 6 # To C-DN - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 2 - ipAddress: "10.0.10.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 4 - - id: 7 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from 10.0.200.2 to 10.0.50.0/24" - fteid: - teid: 2 - ipAddress: "10.0.10.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 2 - - id: 8 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from 10.0.200.2 to 10.0.200.0/24" - fteid: - teid: 2 - ipAddress: "10.0.10.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 2 - - id: 9 # From C-DN - precedence: 254 - pdi: - ue-ip-address: - ip-address: "10.0.200.2" - sourceInterface: "Core" - fteid: - teid: 2 - ipAddress: "10.0.20.3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 5 - - id: 5 # From I-DN - precedence: 255 - pdi: - ue-ip-address: - ip-address: "10.0.200.2" - sourceInterface: "SGi-LAN/N6-LAN" - farid: 5 - #ipv6 - - id: 61 # To C-DN - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 61 - ipAddress: "fd00:d0cc:e700:1111:1::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 61 - - id: 62 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fd00:d0cc:e700:2222:1::1 to fd00:d0cc:e700:1111:5::/80" - fteid: - teid: 61 - ipAddress: "fd00:d0cc:e700:1111:1::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 62 - - id: 63 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fd00:d0cc:e700:2222:1::1 to fd00:d0cc:e700:2222:1::/80" - fteid: - teid: 61 - ipAddress: "fd00:d0cc:e700:1111:1::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 62 - - id: 64 # From C-DN - precedence: 254 - pdi: - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::1" - sourceInterface: "Core" - fteid: - teid: 61 - ipAddress: "fd00:d0cc:e700:2222:2::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 63 - - id: 65 # From I-DN - precedence: 255 - pdi: - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::1" - sourceInterface: "SGi-LAN/N6-LAN" - farid: 63 - - id: 66 # To C-DN - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 62 - ipAddress: "fd00:d0cc:e700:1111:1::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 64 - - id: 67 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fd00:d0cc:e700:2222:1::2 to fd00:d0cc:e700:1111:5::/80" - fteid: - teid: 62 - ipAddress: "fd00:d0cc:e700:1111:1::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 62 - - id: 68 # To I-DN - precedence: 254 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fd00:d0cc:e700:2222:1::2 to fd00:d0cc:e700:2222:1::/80" - fteid: - teid: 62 - ipAddress: "fd00:d0cc:e700:1111:1::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 62 - - id: 69 # From C-DN - precedence: 254 - pdi: - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::2" - sourceInterface: "Core" - fteid: - teid: 62 - ipAddress: "fd00:d0cc:e700:1111:2::3" - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - farid: 65 - - id: 65 # From I-DN - precedence: 255 - pdi: - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::2" - sourceInterface: "SGi-LAN/N6-LAN" - farid: 65 - - id: 99 - precedence: 255 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fe80::/10 to any" - farid: 99 - fars: - - id: 1 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 1 - gtpuPeer: "10.0.20.2" - - id: 2 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "SGi-LAN/N6-LAN" - - id: 3 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 1 - gtpuPeer: "10.0.10.2" - - id: 4 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 2 - gtpuPeer: "10.0.20.2" - - id: 5 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 2 - gtpuPeer: "10.0.10.4" - - id: 61 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 61 - gtpuPeer: "fd00:d0cc:e700:1111:2::2" - - id: 62 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "SGi-LAN/N6-LAN" - - id: 63 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 61 - gtpuPeer: "fd00:d0cc:e700:1111:1::2" - - id: 64 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - outerHeaderCreation: - teid: 62 - gtpuPeer: "fd00:d0cc:e700:1111:2::2" - - id: 65 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 62 - gtpuPeer: "fd00:d0cc:e700:1111:1::4" - - id: 99 - applyAction: - action: "Drop" +# - dnn: "sliceA" +# cidr: "fd00:d0cc:e700:2222:1::/80" +#pfcp-sessions: +# - pdrs: +# - id: 1 # To C-DN +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 1 +# ipAddress: "10.0.10.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 1 +# - id: 2 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from 10.0.200.1 to 10.0.50.0/24" +# fteid: +# teid: 1 +# ipAddress: "10.0.10.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 2 +# - id: 3 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from 10.0.200.1 to 10.0.200.0/24" +# fteid: +# teid: 1 +# ipAddress: "10.0.10.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 2 +# - id: 4 # From C-DN +# precedence: 254 +# pdi: +# ue-ip-address: +# ip-address: "10.0.200.1" +# sourceInterface: "Core" +# fteid: +# teid: 1 +# ipAddress: "10.0.20.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 3 +# - id: 5 # From I-DN +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "10.0.200.1" +# sourceInterface: "SGi-LAN/N6-LAN" +# farid: 3 +# - id: 6 # To C-DN +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 2 +# ipAddress: "10.0.10.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 4 +# - id: 7 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from 10.0.200.2 to 10.0.50.0/24" +# fteid: +# teid: 2 +# ipAddress: "10.0.10.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 2 +# - id: 8 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from 10.0.200.2 to 10.0.200.0/24" +# fteid: +# teid: 2 +# ipAddress: "10.0.10.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 2 +# - id: 9 # From C-DN +# precedence: 254 +# pdi: +# ue-ip-address: +# ip-address: "10.0.200.2" +# sourceInterface: "Core" +# fteid: +# teid: 2 +# ipAddress: "10.0.20.3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 5 +# - id: 5 # From I-DN +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "10.0.200.2" +# sourceInterface: "SGi-LAN/N6-LAN" +# farid: 5 +# #ipv6 +# - id: 61 # To C-DN +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 61 +# ipAddress: "fd00:d0cc:e700:1111:1::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 61 +# - id: 62 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fd00:d0cc:e700:2222:1::1 to fd00:d0cc:e700:1111:5::/80" +# fteid: +# teid: 61 +# ipAddress: "fd00:d0cc:e700:1111:1::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 62 +# - id: 63 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fd00:d0cc:e700:2222:1::1 to fd00:d0cc:e700:2222:1::/80" +# fteid: +# teid: 61 +# ipAddress: "fd00:d0cc:e700:1111:1::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 62 +# - id: 64 # From C-DN +# precedence: 254 +# pdi: +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::1" +# sourceInterface: "Core" +# fteid: +# teid: 61 +# ipAddress: "fd00:d0cc:e700:2222:2::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 63 +# - id: 65 # From I-DN +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::1" +# sourceInterface: "SGi-LAN/N6-LAN" +# farid: 63 +# - id: 66 # To C-DN +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 62 +# ipAddress: "fd00:d0cc:e700:1111:1::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 64 +# - id: 67 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fd00:d0cc:e700:2222:1::2 to fd00:d0cc:e700:1111:5::/80" +# fteid: +# teid: 62 +# ipAddress: "fd00:d0cc:e700:1111:1::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 62 +# - id: 68 # To I-DN +# precedence: 254 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fd00:d0cc:e700:2222:1::2 to fd00:d0cc:e700:2222:1::/80" +# fteid: +# teid: 62 +# ipAddress: "fd00:d0cc:e700:1111:1::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 62 +# - id: 69 # From C-DN +# precedence: 254 +# pdi: +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::2" +# sourceInterface: "Core" +# fteid: +# teid: 62 +# ipAddress: "fd00:d0cc:e700:1111:2::3" +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# farid: 65 +# - id: 65 # From I-DN +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::2" +# sourceInterface: "SGi-LAN/N6-LAN" +# farid: 65 +# - id: 99 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fe80::/10 to any" +# farid: 99 +# fars: +# - id: 1 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 1 +# gtpuPeer: "10.0.20.2" +# - id: 2 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "SGi-LAN/N6-LAN" +# - id: 3 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 1 +# gtpuPeer: "10.0.10.2" +# - id: 4 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 2 +# gtpuPeer: "10.0.20.2" +# - id: 5 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 2 +# gtpuPeer: "10.0.10.4" +# - id: 61 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 61 +# gtpuPeer: "fd00:d0cc:e700:1111:2::2" +# - id: 62 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "SGi-LAN/N6-LAN" +# - id: 63 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 61 +# gtpuPeer: "fd00:d0cc:e700:1111:1::2" +# - id: 64 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# outerHeaderCreation: +# teid: 62 +# gtpuPeer: "fd00:d0cc:e700:1111:2::2" +# - id: 65 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 62 +# gtpuPeer: "fd00:d0cc:e700:1111:1::4" +# - id: 99 +# applyAction: +# action: "Drop" diff --git a/config/upf2.yaml b/config/upf2.yaml index 882d257..03c276d 100644 --- a/config/upf2.yaml +++ b/config/upf2.yaml @@ -1,138 +1,138 @@ pfcp-address: "10.0.60.4" gtpu-entities: - "10.0.20.2" - - "fd00:d0cc:e700:1111:2::2" +# - "fd00:d0cc:e700:1111:2::2" dnn_list: - dnn: "sliceA" cidr: "10.0.200.0/24" - - dnn: "sliceA" - cidr: "fd00:d0cc:e700:2222:1::/80" -pfcp-sessions: - - pdrs: - - id: 1 - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 1 - ipAddress: "10.0.20.2" - farid: 1 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 2 - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 2 - ipAddress: "10.0.20.2" - farid: 1 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 3 - precedence: 255 - pdi: - ue-ip-address: - ip-address: "10.0.200.1" - sourceInterface: "Core" - farid: 2 - - id: 4 - precedence: 255 - pdi: - ue-ip-address: - ip-address: "10.0.200.2" - sourceInterface: "Core" - farid: 3 - - id: 61 - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 61 - ipAddress: "fd00:d0cc:e700:1111:2::2" - farid: 61 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 62 - precedence: 255 - pdi: - sourceInterface: "Access" - fteid: - teid: 62 - ipAddress: "fd00:d0cc:e700:1111:2::2" - farid: 61 - outerHeaderRemoval: - description: 0 - extensionHeaderDeletion: 0 - - id: 63 - precedence: 255 - pdi: - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::1" - sourceInterface: "Core" - farid: 62 - - id: 64 - precedence: 255 - pdi: - ue-ip-address: - ip-address: "fd00:d0cc:e700:2222:1::2" - sourceInterface: "Core" - farid: 63 - - id: 99 - precedence: 255 - pdi: - sourceInterface: "Access" - sdf-filter: - description: "permit out ip from fe80::/10 to any" - farid: 99 - - fars: - - id: 1 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - - id: 2 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 1 - gtpuPeer: "10.0.20.3" - - id: 3 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 2 - gtpuPeer: "10.0.20.3" - - id: 61 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Core" - - id: 62 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 61 - gtpuPeer: "fd00:d0cc:e700:1111:2::3" - - id: 63 - applyAction: - action: "Forward" - forwardingParameters: - destinationInterface: "Access" - outerHeaderCreation: - teid: 62 - gtpuPeer: "fd00:d0cc:e700:1111:2::3" - - id: 99 - applyAction: - action: "Drop" - +# - dnn: "sliceA" +# cidr: "fd00:d0cc:e700:2222:1::/80" +#pfcp-sessions: +# - pdrs: +# - id: 1 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 1 +# ipAddress: "10.0.20.2" +# farid: 1 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 2 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 2 +# ipAddress: "10.0.20.2" +# farid: 1 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 3 +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "10.0.200.1" +# sourceInterface: "Core" +# farid: 2 +# - id: 4 +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "10.0.200.2" +# sourceInterface: "Core" +# farid: 3 +# - id: 61 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 61 +# ipAddress: "fd00:d0cc:e700:1111:2::2" +# farid: 61 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 62 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# fteid: +# teid: 62 +# ipAddress: "fd00:d0cc:e700:1111:2::2" +# farid: 61 +# outerHeaderRemoval: +# description: 0 +# extensionHeaderDeletion: 0 +# - id: 63 +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::1" +# sourceInterface: "Core" +# farid: 62 +# - id: 64 +# precedence: 255 +# pdi: +# ue-ip-address: +# ip-address: "fd00:d0cc:e700:2222:1::2" +# sourceInterface: "Core" +# farid: 63 +# - id: 99 +# precedence: 255 +# pdi: +# sourceInterface: "Access" +# sdf-filter: +# description: "permit out ip from fe80::/10 to any" +# farid: 99 +# +# fars: +# - id: 1 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# - id: 2 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 1 +# gtpuPeer: "10.0.20.3" +# - id: 3 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 2 +# gtpuPeer: "10.0.20.3" +# - id: 61 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Core" +# - id: 62 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 61 +# gtpuPeer: "fd00:d0cc:e700:1111:2::3" +# - id: 63 +# applyAction: +# action: "Forward" +# forwardingParameters: +# destinationInterface: "Access" +# outerHeaderCreation: +# teid: 62 +# gtpuPeer: "fd00:d0cc:e700:1111:2::3" +# - id: 99 +# applyAction: +# action: "Drop" +# diff --git a/docker-compose.yaml b/docker-compose.yaml index 5c03a66..81a49aa 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,6 +20,9 @@ services: net1: ipv4_address: 10.0.10.2 ipv6_address: fd00:d0cc:e700:1111:1::2 + cp: + ipv4_address: 10.0.60.5 + ipv6_address: fd00:d0cc:e700:1111:6::5 ran-2: container_name: ran-2 hostname: ran-2 @@ -40,6 +43,9 @@ services: net1: ipv4_address: 10.0.10.4 ipv6_address: fd00:d0cc:e700:1111:1::4 + cp: + ipv4_address: 10.0.60.6 + ipv6_address: fd00:d0cc:e700:1111:6::6 upf-1: container_name: upf-1 hostname: upf-1 diff --git a/runtime/upf.go b/runtime/upf.go index eeef4f9..4ff7c2f 100644 --- a/runtime/upf.go +++ b/runtime/upf.go @@ -44,13 +44,11 @@ func Run() error { } func createPFCPNode() error { - if Upf.SimulateRAN == nil { - if Upf.PFCPAddress == nil { - return fmt.Errorf("Missing pfcp address") - } - PFCPServer = pfcp_networking.NewPFCPServerEntity(*Upf.PFCPAddress) - PFCPServer.Start() + if Upf.PFCPAddress == nil { + return fmt.Errorf("Missing pfcp address") } + PFCPServer = pfcp_networking.NewPFCPServerEntity(*Upf.PFCPAddress) + PFCPServer.Start() return nil }