Add automated tests for PW
Changes:
- Adds 12 procedures to test all initiation scenarios
- Adds 3 procedures to test all int. transport scenarios
- Adds 4 procedures to test all termination scenarios
- Implements PW generation
- Updates README
Change-Id: Ic56fa02a46ede2b5bf04298338ef839378d09235
diff --git a/ofdpa/utils.py b/ofdpa/utils.py
index cf797e8..167763b 100644
--- a/ofdpa/utils.py
+++ b/ofdpa/utils.py
@@ -69,7 +69,6 @@
controller.message_send( request )
do_barrier( controller )
-
"""
MULTICAST Pipelines
"""
@@ -331,7 +330,6 @@
port_to_src_mac_str = {}
port_to_dst_mac = {}
port_to_dst_mac_str = {}
-
port_to_mpls_label_1 = {}
port_to_mpls_label_2 = {}
port_to_mpls_label_pw = {}
@@ -408,7 +406,6 @@
)
Groups._put( mpls_tunnel_gid )
mpls_gid = mpls_tunnel_gid
-
# add MPLS L2 VPN group
mpls_l2_vpn_gid, mpls_l2_vpn_msg = add_mpls_label_group(
ctrl=controller,
@@ -423,7 +420,6 @@
set_bos=1,
cpy_ttl_outward=True
)
-
Groups._put( mpls_l2_vpn_gid )
# add MPLS L2 port flow
add_mpls_l2_port_flow(
@@ -641,7 +637,6 @@
of_port=in_port,
vlan_id=out_vlan,
flag=VLAN_TABLE_FLAG_ONLY_TAG,
- mpls_type=None
)
add_one_vlan_table_flow(
ctrl=controller,
@@ -665,7 +660,7 @@
logging,
in_port,
out_port,
- egress_tags,
+ egress_tags
):
"""
This method, according to the scenario, fills properly
@@ -747,7 +742,6 @@
of_port=in_port,
vlan_id=out_vlan,
flag=VLAN_TABLE_FLAG_ONLY_TAG,
- mpls_type=None
)
add_one_vlan_table_flow(
ctrl=controller,
@@ -759,7 +753,7 @@
return (
port_to_mpls_label_pw,
port_to_vlan_2,
- port_to_in_vlan_1,
+ port_to_vlan_1,
port_to_switch_mac_str,
Groups
)