Skip to content
Snippets Groups Projects
Commit 4bd431ad authored by Georgios Katsikas's avatar Georgios Katsikas
Browse files

fix: service handlers' temporal configuration

parent d54e917a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/service/service/service_handlers/p4_fabric_tna_acl/p4_fabric_tna_acl_service_handler.py
+ 32
− 21
View file @ 4bd431ad
...@@ -342,13 +342,24 @@ class P4FabricACLServiceHandler(_ServiceHandler): ...@@ -342,13 +342,24 @@ class P4FabricACLServiceHandler(_ServiceHandler):
acl = [ acl = [
{ {
PORT_ID: 1, PORT_ID: 1,
IPV4_SRC: "10.158.72.11", TRN_PORT_DST: 8080,
ACTION: ACTION_DROP
},
{
PORT_ID: 2,
TRN_PORT_SRC: 12345,
ACTION: ACTION_DROP
},
{
PORT_ID: 2,
IPV4_DST: "10.158.72.11",
IPV4_PREFIX_LEN: 32, IPV4_PREFIX_LEN: 32,
ACTION: ACTION_DROP ACTION: ACTION_DROP
}, },
{ {
PORT_ID: 1, PORT_ID: 2,
TRN_PORT_DST: 8080, IPV4_SRC: "10.158.72.12",
IPV4_PREFIX_LEN: 32,
ACTION: ACTION_DROP ACTION: ACTION_DROP
} }
] ]
...@@ -364,24 +375,24 @@ class P4FabricACLServiceHandler(_ServiceHandler): ...@@ -364,24 +375,24 @@ class P4FabricACLServiceHandler(_ServiceHandler):
SWITCH_INFO: switch_info SWITCH_INFO: switch_info
} }
port_map = { # port_map = {
"p4-sw1": { # "p4-sw1": {
"port-1": { # "port-1": {
PORT_ID: 1, # PORT_ID: 1,
ACL: [ # ACL: [
{ # {
IPV4_SRC: "10.158.72.11", # IPV4_SRC: "10.158.72.11",
IPV4_PREFIX_LEN: 32, # IPV4_PREFIX_LEN: 32,
ACTION: ACTION_DROP # ACTION: ACTION_DROP
}, # },
{ # {
TRN_PORT_DST: 8080, # TRN_PORT_DST: 8080,
ACTION: ACTION_DROP # ACTION: ACTION_DROP
} # }
] # ]
} # }
} # }
} # }
def _parse_settings(self): def _parse_settings(self):
#TODO: Pass settings in a correct way #TODO: Pass settings in a correct way
......
src/service/service/service_handlers/p4_fabric_tna_l3/p4_fabric_tna_l3_service_handler.py
+ 28
− 28
View file @ 4bd431ad
...@@ -358,34 +358,34 @@ class P4FabricL3ServiceHandler(_ServiceHandler): ...@@ -358,34 +358,34 @@ class P4FabricL3ServiceHandler(_ServiceHandler):
SWITCH_INFO: switch_info SWITCH_INFO: switch_info
} }
port_map = { # port_map = {
"p4-sw1": { # "p4-sw1": {
"port-1": { # "port-1": {
PORT_ID: 1, # PORT_ID: 1,
PORT_TYPE: PORT_TYPE_HOST, # PORT_TYPE: PORT_TYPE_HOST,
ROUTING_LIST: [ # ROUTING_LIST: [
{ # {
IPV4_DST: "10.158.72.11", # IPV4_DST: "10.158.72.11",
IPV4_PREFIX_LEN: 32, # IPV4_PREFIX_LEN: 32,
MAC_SRC: "fa:16:3e:e2:af:28", # MAC_SRC: "fa:16:3e:e2:af:28",
MAC_DST: "fa:16:3e:75:9c:e5" # MAC_DST: "fa:16:3e:75:9c:e5"
} # }
] # ]
}, # },
"port-2": { # "port-2": {
PORT_ID: 2, # PORT_ID: 2,
PORT_TYPE: PORT_TYPE_HOST, # PORT_TYPE: PORT_TYPE_HOST,
ROUTING_LIST: [ # ROUTING_LIST: [
{ # {
IPV4_DST: "172.16.10.9", # IPV4_DST: "172.16.10.9",
IPV4_PREFIX_LEN: 32, # IPV4_PREFIX_LEN: 32,
MAC_SRC: "fa:16:3e:75:9c:e5", # MAC_SRC: "fa:16:3e:75:9c:e5",
MAC_DST: "fa:16:3e:e2:af:28" # MAC_DST: "fa:16:3e:e2:af:28"
} # }
] # ]
} # }
} # }
} # }
def _parse_settings(self): def _parse_settings(self):
#TODO: Pass settings in a correct way #TODO: Pass settings in a correct way
......
src/tests/p4-fabric-tna/descriptors/service-create-acl.json
+ 4
− 4
View file @ 4bd431ad
...@@ -35,19 +35,19 @@ ...@@ -35,19 +35,19 @@
"action": "drop" "action": "drop"
}, },
{ {
"port_id": 1, "port_id": 2,
"trn_port_src": 12345, "trn_port_src": 12345,
"action": "drop" "action": "drop"
}, },
{ {
"port_id": 1, "port_id": 2,
"ipv4_dst": "172.16.10.10", "ipv4_dst": "10.158.72.11",
"ipv4_prefix_len": 32, "ipv4_prefix_len": 32,
"action": "drop" "action": "drop"
}, },
{ {
"port_id": 2, "port_id": 2,
"ipv4_src": "172.16.10.10", "ipv4_src": "10.158.72.12",
"ipv4_prefix_len": 32, "ipv4_prefix_len": 32,
"action": "drop" "action": "drop"
} }
......
src/tests/tools/test_tools_p4.py
+ 1
− 1
View file @ 4bd431ad
...@@ -30,7 +30,7 @@ ENDPOINT_RULES = 3 ...@@ -30,7 +30,7 @@ ENDPOINT_RULES = 3
INT_RULES = 19 INT_RULES = 19
L2_RULES = 10 L2_RULES = 10
L3_RULES = 4 L3_RULES = 4
ACL_RULES = 2 ACL_RULES = 1
DATAPLANE_RULES_NB_INT_B1 = 5 DATAPLANE_RULES_NB_INT_B1 = 5
DATAPLANE_RULES_NB_INT_B2 = 6 DATAPLANE_RULES_NB_INT_B2 = 6
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment