floodlight · Sep 4, 2014 · Sep 6, 2014 · Sep 6, 2014 · Sep 19, 2014 · Oct 9, 2014
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ openflowj-loxi
 /bin
 *,cover
 /.coverage
+*.iml
diff --git a/.gitreview b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.onosproject.org
+port=29418
+project=onos-loxi.git
+defaultremote=origin
+defaultbranch=master
diff --git a/c_gen/c_code_gen.py b/c_gen/c_code_gen.py
@@ -659,10 +659,13 @@ def base_h_content(out):
 
 /* Currently these are categorized as scalars */
 typedef char of_port_name_t[OF_MAX_PORT_NAME_LEN];
+typedef char of_app_code_t[OF_APP_CODE_LEN];
 typedef char of_table_name_t[OF_MAX_TABLE_NAME_LEN];
 typedef char of_desc_str_t[OF_DESC_STR_LEN];
 typedef char of_serial_num_t[OF_SERIAL_NUM_LEN];
 typedef char of_str64_t[64];
+typedef char of_str32_t[32];
+typedef char of_str6_t[6];
 
 typedef struct of_bitmap_128_s {
     uint64_t hi;

diff --git a/c_gen/c_test_gen.py b/c_gen/c_test_gen.py
@@ -93,6 +93,8 @@ def var_name_map(m_type):
         of_desc_str_t="desc_str",
         of_serial_num_t="ser_num",
         of_str64_t="str64",
+        of_str32_t="str32",
+        of_str6_t="str6",
         of_mac_addr_t="mac_addr",
         of_ipv6_t="ipv6",
         # Non-scalars; more TBD
@@ -107,6 +109,9 @@ def var_name_map(m_type):
         of_bitmap_128_t="bitmap_128",
         of_bitmap_512_t="bitmap_512",
         of_checksum_128_t="checksum_128",
+	#Circuit extensions
+        of_app_code_t="app_code",
+	of_sig_id_t="sig_id",
         )
 
     if m_type.find("of_list_") == 0:
@@ -121,7 +126,8 @@ def var_name_map(m_type):
 string_types = [ "of_port_name_t", "of_table_name_t",
                 "of_desc_str_t", "of_serial_num_t", "of_mac_addr_t",
                 "of_ipv6_t", "of_bitmap_128_t", "of_checksum_128_t",
-                "of_str64_t", "of_bitmap_512_t"]
+                "of_str64_t", "of_str32_t", "of_str6_t",
+                "of_app_code_t", "of_bitmap_512_t"]
 
 scalar_types = integer_types[:]
 scalar_types.extend(string_types)

diff --git a/c_gen/of_g_legacy.py b/c_gen/of_g_legacy.py
@@ -86,7 +86,9 @@
     OF_MAX_PORT_NAME_LEN  = 16,
     OF_ETH_ALEN = 6,
     OF_DESC_STR_LEN   = 256,
-    OF_SERIAL_NUM_LEN = 32
+    OF_SERIAL_NUM_LEN = 32,
+    OF_APP_CODE_LEN = 15, 	
+    OF_SIGID_LEN=6, 	
 )
 
 ## List of mixed data types
@@ -162,6 +164,31 @@
         5: "of_match_v3_t",  # Currently uses same match as 1.2 (v3).
         "short_name":"match"
         },
+    of_calient_port_desc_stats_entry_t = {
+        1: "of_calient_port_desc_stats_entry_t",
+        2: "of_calient_port_desc_stats_entry_t",
+        3: "of_calient_port_desc_stats_entry_t",
+        4: "of_calient_port_desc_stats_entry_t",
+        5: "of_calient_port_desc_stats_entry_t",
+        "short_name":"calient_port_desc_stats_entry"
+        },
+    of_odu_sig_id_t = {
+        1: "of_odu_sig_id_t",
+        2: "of_odu_sig_id_t",
+        3: "of_odu_sig_id_t",
+        4: "of_odu_sig_id_t",
+        5: "of_odu_sig_id_t",
+        "short_name":"odu_sig_id"
+        },
+    of_och_sig_id_t = {
+        1: "of_sig_id_t",
+        2: "of_sig_id_t",
+        3: "of_sig_id_t",
+        4: "of_sig_id_t",
+        5: "of_sig_id_t",
+        "short_name":"sig_id"
+        },
+
 )
 
 ## Base data types
@@ -199,6 +226,8 @@
     of_serial_num_t = dict(bytes=ofp_constants["OF_SERIAL_NUM_LEN"],
                            short_name="ser_num"),
     of_str64_t = dict(bytes=64, short_name="str64"),
+    of_str32_t = dict(bytes=32, short_name="str32"),
+    of_str6_t = dict(bytes=6, short_name="str6"),
     of_match_v1_t = dict(bytes=40, to_w="match_v1_hton",
                          from_w="match_v1_ntoh",
                          short_name="match_v1"),
@@ -215,14 +244,19 @@
     of_bitmap_128_t = dict(bytes=16, short_name="bitmap_128"),
     of_bitmap_512_t = dict(bytes=64, short_name="bitmap_512"),
     of_checksum_128_t = dict(bytes=16, short_name="checksum_128"),
+    of_app_code_t = dict(bytes=ofp_constants["OF_APP_CODE_LEN"],
+                          short_name="app_code"),
+    of_sig_id_t = dict(bytes=ofp_constants["OF_SIGID_LEN"],
+                          short_name="sig_id"),
+    of_odu_sig_id_t = dict(bytes=1, short_name="odu_sig_id"),
 )
 
 of_scalar_types = ["char", "uint8_t", "uint16_t", "uint32_t", "uint64_t",
                    "of_port_no_t", "of_fm_cmd_t", "of_wc_bmap_t",
                    "of_match_bmap_t", "of_port_name_t", "of_table_name_t",
                    "of_desc_str_t", "of_serial_num_t", "of_mac_addr_t",
                    "of_ipv6_t", "of_ipv4_t", "of_bitmap_128_t", "of_checksum_128_t",
-                   "of_str64_t", "of_bitmap_512_t"]
+                   "of_str64_t", "of_str32_t", "of_str6_t", "of_bitmap_512_t"]
 
 ##
 # LOXI identifiers

diff --git a/c_gen/templates/loci_dump.h b/c_gen/templates/loci_dump.h
@@ -91,6 +91,8 @@ typedef int (*loci_obj_dump_f)(loci_writer_f writer, void *cookie, of_object_t *
 #define LOCI_DUMP_desc_str(writer, cookie, val) LOCI_DUMP_string(writer, cookie, val)
 #define LOCI_DUMP_ser_num(writer, cookie, val) LOCI_DUMP_string(writer, cookie, val)
 #define LOCI_DUMP_str64(writer, cookie, val) LOCI_DUMP_string(writer, cookie, val)
+#define LOCI_DUMP_str6(writer, cookie, val) LOCI_DUMP_string(writer, cookie, val)
+#define LOCI_DUMP_str32(writer, cookie, val) LOCI_DUMP_string(writer, cookie, val)
 
 int loci_dump_match(loci_writer_f writer, void* cookie, of_match_t *match);
 #define LOCI_DUMP_match(writer, cookie, val) loci_dump_match(writer, cookie, &val)

diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
@@ -105,6 +105,8 @@ typedef int (*loci_obj_show_f)(loci_writer_f writer,
 #define LOCI_SHOW_desc_str(writer, cookie, val) LOCI_SHOW_string(writer, cookie, val)
 #define LOCI_SHOW_ser_num(writer, cookie, val) LOCI_SHOW_string(writer, cookie, val)
 #define LOCI_SHOW_str64(writer, cookie, val) LOCI_SHOW_string(writer, cookie, val)
+#define LOCI_SHOW_str6(writer, cookie, val) LOCI_SHOW_string(writer, cookie, val)
+#define LOCI_SHOW_str32(writer, cookie, val) LOCI_SHOW_string(writer, cookie, val)
 
 int loci_show_match(loci_writer_f writer, void *cookie, of_match_t *match);
 #define LOCI_SHOW_match(writer, cookie, val) loci_show_match(writer, cookie, &val)

diff --git a/c_gen/templates/of_wire_buf.h b/c_gen/templates/of_wire_buf.h
@@ -888,6 +888,52 @@ _wbuf_octets_get(of_wire_buffer_t *wbuf, int offset, uint8_t *dst, int bytes) {
 #define of_wire_buffer_checksum_128_set(buf, offset, checksum) \
     (of_wire_buffer_u64_set(buf, offset, checksum.hi), of_wire_buffer_u64_set(buf, offset+8, checksum.lo))
 
+/**
+ * Get a str32 string from a wire buffer
+ * @param wbuf The pointer to the wire buffer structure
+ * @param offset Offset in the wire buffer
+ * @param s The string
+ *
+ * Uses the octets function.
+ */
+
+#define of_wire_buffer_str32_get(buf, offset, s) \
+    _wbuf_octets_get(buf, offset, (uint8_t *)s, 32)
+
+/**
+ * Set a str32 string in a wire buffer
+ * @param wbuf The pointer to the wire buffer structure
+ * @param offset Offset in the wire buffer
+ * @param s Where to store the str32
+ *
+ * Uses the octets function.
+ */
+
+#define of_wire_buffer_str32_set(buf, offset, s) \
+    _wbuf_octets_set(buf, offset, (uint8_t *)s, 32)
+
+/**
+ * Get a str6 string from a wire buffer
+ * @param wbuf The pointer to the wire buffer structure
+ * @param offset Offset in the wire buffer
+ * @param s The string
+ *
+ * Uses the octets function.
+ */
+
+#define of_wire_buffer_str6_get(buf, offset, s) \
+    _wbuf_octets_get(buf, offset, (uint8_t *)s, 6)
+/**
+ * Set a str6 string in a wire buffer
+ * @param wbuf The pointer to the wire buffer structure
+ * @param offset Offset in the wire buffer
+ * @param s Where to store the str6
+ *
+ * Uses the octets function.
+ */
+
+#define of_wire_buffer_str6_set(buf, offset, s) \
+    _wbuf_octets_set(buf, offset, (uint8_t *)s, 6)
 
 /**
  * Get a bitmap_512 from a wire buffer

diff --git a/java_gen/java_type.py b/java_gen/java_type.py
@@ -369,10 +369,13 @@ def gen_fixed_length_string_jtype(length):
             default="VFI.ZERO")
 
 port_name = gen_fixed_length_string_jtype(16)
+app_code = gen_fixed_length_string_jtype(15)
 desc_str = gen_fixed_length_string_jtype(256)
 serial_num = gen_fixed_length_string_jtype(32)
 table_name = gen_fixed_length_string_jtype(32)
 str64 = gen_fixed_length_string_jtype(64)
+str32 = gen_fixed_length_string_jtype(32)
+str6 = gen_fixed_length_string_jtype(6)
 ipv4 = JType("IPv4Address") \
         .op(read="IPv4Address.read4Bytes(bb)", \
             write="$name.write4Bytes(bb)",
@@ -481,6 +484,10 @@ def gen_fixed_length_string_jtype(length):
             .op(read='OFBitMask128.read16Bytes(bb)',
                 write='$name.write16Bytes(bb)',
                 default='OFBitMask128.NONE')
+port_bitmap_256 = JType('OFBitMask256') \
+            .op(read='OFBitMask256.read32Bytes(bb)',
+                write='$name.write32Bytes(bb)',
+                default='OFBitMask256.NONE')
 port_bitmap_512 = JType('OFBitMask512') \
             .op(read='OFBitMask512.read64Bytes(bb)',
                 write='$name.write64Bytes(bb)',
@@ -541,6 +548,12 @@ def gen_fixed_length_string_jtype(length):
          .op(read="OFBufferId.of(bb.readInt())", write="bb.writeInt($name.getInt())", default="OFBufferId.NO_BUFFER")
 lag_id = JType("LagId") \
          .op(version=ANY, read="LagId.read4Bytes(bb)", write="$name.write4Bytes(bb)", default="LagId.NONE")
+odu_sig_id = JType("OduSignalID") \
+        .op(read="OduSignalID.readFrom(bb)", \
+            write="$name.writeTo(bb)",
+            default='OduSignalID.DEFAULT')
+sig_id = JType("CircuitSignalID") \
+         .op(version=ANY, read="CircuitSignalID.read6Bytes(bb)", write="$name.write6Bytes(bb)", default="CircuitSignalID.NONE")
 vrf = JType("VRF") \
          .op(version=ANY, read="VRF.read4Bytes(bb)", write="$name.write4Bytes(bb)", default="VRF.ZERO")
 class_id = JType("ClassId") \
@@ -569,6 +582,8 @@ def gen_fixed_length_string_jtype(length):
 
 generic_t = JType("T")
 
+calient_port_desc_stats_entry = JType('OFCalientPortDescStatsEntry').op(read='OFCalientPortDescStatsEntryVer$version.READER.readFrom(bb)', write='$name.writeTo(bb)')
+
 table_desc = JType('OFTableDesc') \
         .op(read='OFTableDescVer$version.READER.readFrom(bb)', \
             write='$name.writeTo(bb)')
@@ -608,17 +623,25 @@ def gen_fixed_length_string_jtype(length):
         'of_port_name_t': port_name,
         'of_table_name_t': table_name,
         'of_str64_t': str64,
+        'of_str32_t': str32,
+        'of_str6_t': str6,
+        'of_calient_port_desc_stats_entry_t': calient_port_desc_stats_entry,
         'of_ipv4_t': ipv4,
         'of_ipv6_t': ipv6,
         'of_wc_bmap_t': flow_wildcards,
         'of_oxm_t': oxm,
         'of_oxs_t': oxs,
         'of_meter_features_t': meter_features,
         'of_bitmap_128_t': port_bitmap_128,
+        'of_bitmap_256_t': port_bitmap_256,
         'of_bitmap_512_t': port_bitmap_512,
         'of_checksum_128_t': u128,
         'of_bsn_vport_t': bsn_vport,
+        'of_app_code_t': app_code,  
+        'of_sig_id_t': sig_id,
         'of_table_desc_t': table_desc,
+        'of_odu_sig_id_t': odu_sig_id,
+        'of_och_sig_id_t' : sig_id,
         'of_controller_status_entry_t' : controller_status_entry,
         'of_time_t' : of_time,
         'of_header_t' : of_message,
@@ -698,6 +721,9 @@ def gen_fixed_length_string_jtype(length):
         'of_oxm_bsn_in_ports_128' : { 'value': port_bitmap_128 },
         'of_oxm_bsn_in_ports_128_masked' : { 'value': port_bitmap_128, 'value_mask': port_bitmap_128 },
 
+        'of_oxm_bsn_in_ports_256' : { 'value': port_bitmap_256 },
+        'of_oxm_bsn_in_ports_256_masked' : { 'value': port_bitmap_256, 'value_mask': port_bitmap_256 },
+
         'of_oxm_bsn_in_ports_512' : { 'value': port_bitmap_512 },
         'of_oxm_bsn_in_ports_512_masked' : { 'value': port_bitmap_512, 'value_mask': port_bitmap_512 },
 
@@ -814,10 +840,101 @@ def gen_fixed_length_string_jtype(length):
         'of_bsn_log': { 'data': var_string },
 
         'of_features_reply' : { 'auxiliary_id' : of_aux_id},
+        'of_oxm_och_sigtype' : { 'value' : u8obj },
+        'of_oxm_och_sigtype_basic' : { 'value' : u8obj },
+        'of_oxm_och_sigid' : {'value' : sig_id},
+        'of_oxm_och_sigid_basic' : {'value' : sig_id},
+
+        'of_oxm_och_sigatt' : { 'value' : u32obj },
+        'of_oxm_och_sigatt_basic' : { 'value' : u32obj },
 
         'of_bundle_add_msg' : { 'data' : of_message },
+
+        'of_oxm_exp_odu_sigtype' : { 'value' : u8obj },
+        'of_oxm_exp_och_sigtype' : { 'value' : u8obj },
+
+        'of_oxm_reg0' : { 'value' : u32obj },
+        'of_oxm_reg0_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_reg1' : { 'value' : u32obj },
+        'of_oxm_reg1_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_reg2' : { 'value' : u32obj },
+        'of_oxm_reg2_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_reg3' : { 'value' : u32obj },
+        'of_oxm_reg3_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_reg4' : { 'value' : u32obj },
+        'of_oxm_reg4_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_reg5' : { 'value' : u32obj },
+        'of_oxm_reg5_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_reg6' : { 'value' : u32obj },
+        'of_oxm_reg6_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_reg7' : { 'value' : u32obj },
+        'of_oxm_reg7_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_nsp' : { 'value' : u32obj },
+        'of_oxm_nsp_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_nsi' : { 'value' : u8obj },
+        'of_oxm_nsi_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
+
+        'of_oxm_nsh_c1' : { 'value' : u32obj },
+        'of_oxm_nsh_c1_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_nsh_c2' : { 'value' : u32obj },
+        'of_oxm_nsh_c2_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_nsh_c3' : { 'value' : u32obj },
+        'of_oxm_nsh_c3_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_nsh_c4' : { 'value' : u32obj },
+        'of_oxm_nsh_c4_masked' : { 'value' : u32obj, 'value_mask' : u32obj },
+
+        'of_oxm_nsh_mdtype' : { 'value' : u8obj },
+        'of_oxm_nsh_mdtype_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
+
+        'of_oxm_nsh_np' : { 'value' : u8obj },
+        'of_oxm_nsh_np_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
+
+        'of_oxm_encap_eth_src' : { 'value' : mac_addr },
+        'of_oxm_encap_eth_src_masked' : { 'value' : mac_addr, 'value_mask' : mac_addr },
+
+        'of_oxm_encap_eth_dst' : { 'value' : mac_addr },
+        'of_oxm_encap_eth_dst_masked' : { 'value' : mac_addr, 'value_mask' : mac_addr },
+
+        'of_oxm_encap_eth_type' : { 'value' : u16obj },
+        'of_oxm_encap_eth_type_masked' : { 'value' : u16obj, 'value_mask' : u16obj },
+
+        'of_oxm_tun_flags' : { 'value' : u16obj },
+        'of_oxm_tun_flags_masked' : { 'value' : u16obj, 'value_mask' : u16obj },
+
+        'of_oxm_tun_gbp_id' : { 'value' : u16obj },
+        'of_oxm_tun_gbp_id_masked' : { 'value' : u16obj, 'value_mask' : u16obj },
+
+        'of_oxm_tun_gbp_flags' : { 'value' : u8obj },
+        'of_oxm_tun_gbp_flags_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
+
+        'of_oxm_tun_gpe_np' : { 'value' : u8obj },
+        'of_oxm_tun_gpe_np_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
+
+        'of_oxm_tun_gpe_flags' : { 'value' : u8obj },
+        'of_oxm_tun_gpe_flags_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
         'of_flow_stats_request' : { 'out_group' : of_group },
-        'of_flow_lightweight_stats_request' : { 'out_group' : of_group }
+        'of_flow_lightweight_stats_request' : { 'out_group' : of_group },
+
+        'of_oxm_ofdpa_mpls_type' : { 'value': u16obj },
+
+        'of_oxm_ofdpa_qos_index': { 'value': u8obj },
+
+        'of_oxm_ofdpa_mpls_l2_port': { 'value': u32obj },
+        'of_oxm_ofdpa_mpls_l2_port_masked': { 'value': u32obj, 'value_mask': u32obj },
+
+        'of_oxm_ofdpa_ovid': { 'value': u16obj },
 }
-Original file line number
+Diff line change
@@ @@ -14,3 +14,4 @@ openflowj-loxi @@
     /bin
     *,cover
     /.coverage
+    *.iml