Skip to content

Commit

Permalink
Artifacts from floodlight/loxigen@704e718...00df802 (Branch master)
Browse files Browse the repository at this point in the history 
Loxigen Head commit floodlight/loxigen@00df802
commit 00df802a02f1422a954fa67a90311a24c37c4d09
Merge: 704e718 b809b38
Author: abat <abat@bigswitch.com>
Date:   Sat Jul 2 09:08:23 2016 -0700

    Merge into master from pull request #499:
    Add OFP_BSN_PKTIN_FLAG_ANALYTICS (floodlight/loxigen#499)

commit b809b380b58351bc26ea76fa84853585d1eda632
Author: Shudong Zhou <shudongzhou@gmail.com>
Date:   Fri Jul 1 22:49:15 2016 -0700

    Add OFP_BSN_PKTIN_FLAG_ANALYTICS
  • Loading branch information
abat committed Jul 2, 2016
1 parent e271610 commit 74748d9
Show file tree
Hide file tree
Showing 11 changed files with 573 additions and 513 deletions.
1,040 changes: 529 additions & 511 deletions loci/inc/loci/loci_idents.h
View file

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions locitest/src/test_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286147,6 +286147,20 @@ test_ident_macros(void)
TEST_ASSERT(!OFPMOFC_UNKNOWN_MONITOR_SUPPORTED(OF_VERSION_1_2));
TEST_ASSERT(!OFPMOFC_UNKNOWN_MONITOR_SUPPORTED(OF_VERSION_1_3));
TEST_ASSERT(OFPMOFC_UNKNOWN_MONITOR_SUPPORTED(OF_VERSION_1_4));
value = OFP_BSN_PKTIN_FLAG_ANALYTICS;
TEST_ASSERT(!OFP_BSN_PKTIN_FLAG_ANALYTICS_SUPPORTED(OF_VERSION_1_0));
TEST_ASSERT(!OFP_BSN_PKTIN_FLAG_ANALYTICS_SUPPORTED(OF_VERSION_1_1));
TEST_ASSERT(!OFP_BSN_PKTIN_FLAG_ANALYTICS_SUPPORTED(OF_VERSION_1_2));
TEST_ASSERT(OFP_BSN_PKTIN_FLAG_ANALYTICS_SUPPORTED(OF_VERSION_1_3));
TEST_ASSERT(OFP_BSN_PKTIN_FLAG_ANALYTICS_SUPPORTED(OF_VERSION_1_4));

flags = 0;
OFP_BSN_PKTIN_FLAG_ANALYTICS_SET(flags, OF_VERSION_1_3);
TEST_ASSERT(flags == OFP_BSN_PKTIN_FLAG_ANALYTICS_BY_VERSION(OF_VERSION_1_3));
TEST_ASSERT(OFP_BSN_PKTIN_FLAG_ANALYTICS_TEST(flags, OF_VERSION_1_3));
OFP_BSN_PKTIN_FLAG_ANALYTICS_CLEAR(flags, OF_VERSION_1_3);
TEST_ASSERT(flags == 0);
TEST_ASSERT(!OFP_BSN_PKTIN_FLAG_ANALYTICS_TEST(flags, OF_VERSION_1_3));
value = OF_TABLE_MOD_FAILED_EPERM;
TEST_ASSERT(!OF_TABLE_MOD_FAILED_EPERM_SUPPORTED(OF_VERSION_1_0));
TEST_ASSERT(!OF_TABLE_MOD_FAILED_EPERM_SUPPORTED(OF_VERSION_1_1));
Expand Down
2 changes: 1 addition & 1 deletion loxi-revision
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
704e718a22c4d069365644d4963d0c9b61c02792 Merge into master from pull request #498: BSC-9320 making LENGTH field public from IPv6Address class (https://github.com/floodlight/loxigen/pull/498)
00df802a02f1422a954fa67a90311a24c37c4d09 Merge into master from pull request #499: Add OFP_BSN_PKTIN_FLAG_ANALYTICS (https://github.com/floodlight/loxigen/pull/499)
3 changes: 2 additions & 1 deletion openflowj/gen-src/main/java/org/projectfloodlight/openflow/protocol/OFBsnPktinFlag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ public enum OFBsnPktinFlag {
BSN_PKTIN_FLAG_IGMP,
BSN_PKTIN_FLAG_PIM,
BSN_PKTIN_FLAG_VXLAN_SIP_MISS,
BSN_PKTIN_FLAG_MC_RESERVED;
BSN_PKTIN_FLAG_MC_RESERVED,
BSN_PKTIN_FLAG_ANALYTICS;
}
6 changes: 6 additions & 0 deletions ...ain/java/org/projectfloodlight/openflow/protocol/ver13/OFBsnPktinFlagSerializerVer13.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public class OFBsnPktinFlagSerializerVer13 {
public final static long BSN_PKTIN_FLAG_PIM_VAL = 0x8000L;
public final static long BSN_PKTIN_FLAG_VXLAN_SIP_MISS_VAL = 0x10000L;
public final static long BSN_PKTIN_FLAG_MC_RESERVED_VAL = 0x20000L;
public final static long BSN_PKTIN_FLAG_ANALYTICS_VAL = 0x40000L;

public static Set<OFBsnPktinFlag> readFrom(ByteBuf bb) throws OFParseError {
try {
Expand Down Expand Up @@ -110,6 +111,8 @@ public static Set<OFBsnPktinFlag> ofWireValue(long val) {
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_VXLAN_SIP_MISS);
if((val & BSN_PKTIN_FLAG_MC_RESERVED_VAL) != 0)
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_MC_RESERVED);
if((val & BSN_PKTIN_FLAG_ANALYTICS_VAL) != 0)
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_ANALYTICS);
return Collections.unmodifiableSet(set);
}

Expand Down Expand Up @@ -172,6 +175,9 @@ public static long toWireValue(Set<OFBsnPktinFlag> set) {
case BSN_PKTIN_FLAG_MC_RESERVED:
wireValue |= BSN_PKTIN_FLAG_MC_RESERVED_VAL;
break;
case BSN_PKTIN_FLAG_ANALYTICS:
wireValue |= BSN_PKTIN_FLAG_ANALYTICS_VAL;
break;
default:
throw new IllegalArgumentException("Illegal enum value for type OFBsnPktinFlag in version 1.3: " + e);
}
Expand Down
6 changes: 6 additions & 0 deletions ...ain/java/org/projectfloodlight/openflow/protocol/ver14/OFBsnPktinFlagSerializerVer14.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public class OFBsnPktinFlagSerializerVer14 {
public final static long BSN_PKTIN_FLAG_PIM_VAL = 0x8000L;
public final static long BSN_PKTIN_FLAG_VXLAN_SIP_MISS_VAL = 0x10000L;
public final static long BSN_PKTIN_FLAG_MC_RESERVED_VAL = 0x20000L;
public final static long BSN_PKTIN_FLAG_ANALYTICS_VAL = 0x40000L;

public static Set<OFBsnPktinFlag> readFrom(ByteBuf bb) throws OFParseError {
try {
Expand Down Expand Up @@ -110,6 +111,8 @@ public static Set<OFBsnPktinFlag> ofWireValue(long val) {
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_VXLAN_SIP_MISS);
if((val & BSN_PKTIN_FLAG_MC_RESERVED_VAL) != 0)
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_MC_RESERVED);
if((val & BSN_PKTIN_FLAG_ANALYTICS_VAL) != 0)
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_ANALYTICS);
return Collections.unmodifiableSet(set);
}

Expand Down Expand Up @@ -172,6 +175,9 @@ public static long toWireValue(Set<OFBsnPktinFlag> set) {
case BSN_PKTIN_FLAG_MC_RESERVED:
wireValue |= BSN_PKTIN_FLAG_MC_RESERVED_VAL;
break;
case BSN_PKTIN_FLAG_ANALYTICS:
wireValue |= BSN_PKTIN_FLAG_ANALYTICS_VAL;
break;
default:
throw new IllegalArgumentException("Illegal enum value for type OFBsnPktinFlag in version 1.4: " + e);
}
Expand Down
6 changes: 6 additions & 0 deletions ...ain/java/org/projectfloodlight/openflow/protocol/ver15/OFBsnPktinFlagSerializerVer15.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public class OFBsnPktinFlagSerializerVer15 {
public final static long BSN_PKTIN_FLAG_PIM_VAL = 0x8000L;
public final static long BSN_PKTIN_FLAG_VXLAN_SIP_MISS_VAL = 0x10000L;
public final static long BSN_PKTIN_FLAG_MC_RESERVED_VAL = 0x20000L;
public final static long BSN_PKTIN_FLAG_ANALYTICS_VAL = 0x40000L;

public static Set<OFBsnPktinFlag> readFrom(ByteBuf bb) throws OFParseError {
try {
Expand Down Expand Up @@ -110,6 +111,8 @@ public static Set<OFBsnPktinFlag> ofWireValue(long val) {
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_VXLAN_SIP_MISS);
if((val & BSN_PKTIN_FLAG_MC_RESERVED_VAL) != 0)
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_MC_RESERVED);
if((val & BSN_PKTIN_FLAG_ANALYTICS_VAL) != 0)
set.add(OFBsnPktinFlag.BSN_PKTIN_FLAG_ANALYTICS);
return Collections.unmodifiableSet(set);
}

Expand Down Expand Up @@ -172,6 +175,9 @@ public static long toWireValue(Set<OFBsnPktinFlag> set) {
case BSN_PKTIN_FLAG_MC_RESERVED:
wireValue |= BSN_PKTIN_FLAG_MC_RESERVED_VAL;
break;
case BSN_PKTIN_FLAG_ANALYTICS:
wireValue |= BSN_PKTIN_FLAG_ANALYTICS_VAL;
break;
default:
throw new IllegalArgumentException("Illegal enum value for type OFBsnPktinFlag in version 1.5: " + e);
}
Expand Down
2 changes: 2 additions & 0 deletions pyloxi/loxi/of13/const.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
OFP_BSN_PKTIN_FLAG_PIM = 32768
OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS = 65536
OFP_BSN_PKTIN_FLAG_MC_RESERVED = 131072
OFP_BSN_PKTIN_FLAG_ANALYTICS = 262144

ofp_bsn_pktin_flag_map = {
1: 'OFP_BSN_PKTIN_FLAG_PDU',
Expand All @@ -450,6 +451,7 @@
32768: 'OFP_BSN_PKTIN_FLAG_PIM',
65536: 'OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS',
131072: 'OFP_BSN_PKTIN_FLAG_MC_RESERVED',
262144: 'OFP_BSN_PKTIN_FLAG_ANALYTICS',
}

# Identifiers from group ofp_bsn_port_counter
Expand Down
2 changes: 2 additions & 0 deletions pyloxi/loxi/of14/const.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@
OFP_BSN_PKTIN_FLAG_PIM = 32768
OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS = 65536
OFP_BSN_PKTIN_FLAG_MC_RESERVED = 131072
OFP_BSN_PKTIN_FLAG_ANALYTICS = 262144

ofp_bsn_pktin_flag_map = {
1: 'OFP_BSN_PKTIN_FLAG_PDU',
Expand All @@ -479,6 +480,7 @@
32768: 'OFP_BSN_PKTIN_FLAG_PIM',
65536: 'OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS',
131072: 'OFP_BSN_PKTIN_FLAG_MC_RESERVED',
262144: 'OFP_BSN_PKTIN_FLAG_ANALYTICS',
}

# Identifiers from group ofp_bsn_port_counter
Expand Down
2 changes: 2 additions & 0 deletions pyloxi/loxi/of15/const.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@
OFP_BSN_PKTIN_FLAG_PIM = 32768
OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS = 65536
OFP_BSN_PKTIN_FLAG_MC_RESERVED = 131072
OFP_BSN_PKTIN_FLAG_ANALYTICS = 262144

ofp_bsn_pktin_flag_map = {
1: 'OFP_BSN_PKTIN_FLAG_PDU',
Expand All @@ -534,6 +535,7 @@
32768: 'OFP_BSN_PKTIN_FLAG_PIM',
65536: 'OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS',
131072: 'OFP_BSN_PKTIN_FLAG_MC_RESERVED',
262144: 'OFP_BSN_PKTIN_FLAG_ANALYTICS',
}

# Identifiers from group ofp_bsn_port_counter
Expand Down
3 changes: 3 additions & 0 deletions wireshark/openflow.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,7 @@ enum_v4_ofp_bsn_pktin_flag = {
[32768] = "OFP_BSN_PKTIN_FLAG_PIM",
[65536] = "OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS",
[131072] = "OFP_BSN_PKTIN_FLAG_MC_RESERVED",
[262144] = "OFP_BSN_PKTIN_FLAG_ANALYTICS",
}

enum_v4_ofp_bad_instruction_code = {
Expand Down Expand Up @@ -2718,6 +2719,7 @@ enum_v5_ofp_bsn_pktin_flag = {
[32768] = "OFP_BSN_PKTIN_FLAG_PIM",
[65536] = "OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS",
[131072] = "OFP_BSN_PKTIN_FLAG_MC_RESERVED",
[262144] = "OFP_BSN_PKTIN_FLAG_ANALYTICS",
}

enum_v5_ofp_bad_instruction_code = {
Expand Down Expand Up @@ -3778,6 +3780,7 @@ enum_v6_ofp_bsn_pktin_flag = {
[32768] = "OFP_BSN_PKTIN_FLAG_PIM",
[65536] = "OFP_BSN_PKTIN_FLAG_VXLAN_SIP_MISS",
[131072] = "OFP_BSN_PKTIN_FLAG_MC_RESERVED",
[262144] = "OFP_BSN_PKTIN_FLAG_ANALYTICS",
}

enum_v6_ofp_bad_instruction_code = {
Expand Down

0 comments on commit 74748d9

Please sign in to comment.