Commit ae0fcdea authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into...

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/163-implement-camara-based-nbi-connector
parents 1446f0c9 64cabb4e
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ LOGGER = logging.getLogger(__name__)
SWITCH_INFO = "switch_info"
ARCH = "arch"
DPID = "dpid"
IFACE = "iface"
MAC = "mac"
IP = "ip"
PORT = "port"                        # Dataplane port
@@ -129,7 +130,7 @@ MIRROR_TYPE_INVALID = 0
MIRROR_TYPE_INT_REPORT = 1

# VLAN
VLAN_DEF = 4094
DEF_VLAN = 4094

# Supported Ethernet types
ETHER_TYPE_IPV4 = "0x0800"
@@ -216,7 +217,7 @@ def rules_set_up_port_ingress(
    assert chk_vlan_id(vlan_id), "Invalid VLAN ID to configure ingress port"

    # VLAN support if 1
    vlan_is_valid = 1 if vlan_id != VLAN_DEF else 0
    vlan_is_valid = 1 if vlan_id != DEF_VLAN else 0

    rule_no = cache_rule(TABLE_INGRESS_VLAN, action)