Artifacts from floodlight/loxigen@2cc26f2...83314ed

Loxigen Head commit floodlight/loxigen@83314ed
commit 83314edfecd0085d04e948ec9ddeb37780ccf175
Merge: 2cc26f2 d473459
Author: abat <abat@bigswitch.com>
Date:   Thu Feb 18 13:44:40 2016 -0800

    Merge into master from pull request #464:
    add gencmd extension and of_bsn_tlv_vlan_mac_list (floodlight/loxigen#464)

commit d4734591751c25e756f590dcedf590520b25f1de
Author: Rich Lane <rlane@bigswitch.com>
Date:   Tue Feb 9 14:27:26 2016 -0800

    openflow_input: add of_bsn_tlv_vlan_mac_list

commit e6ab937e63231494e8e7ea9451afd0128e8cfa26
Author: Rich Lane <rlane@bigswitch.com>
Date:   Tue Feb 9 14:24:41 2016 -0800

    openflow_input: add bsn_generic_command extension

loci/inc/loci/loci_classes.h

@@ -987,6 +987,8 @@ void of_bsn_tlv_use_packet_state_wire_object_id_get(of_object_t *obj, of_object_
 void of_bsn_tlv_use_packet_state_push_wire_types(of_object_t *obj);
 void of_bsn_tlv_vfi_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_tlv_vfi_push_wire_types(of_object_t *obj);
+void of_bsn_tlv_vlan_mac_list_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
+void of_bsn_tlv_vlan_mac_list_push_wire_types(of_object_t *obj);
 void of_bsn_tlv_vlan_pcp_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_tlv_vlan_pcp_push_wire_types(of_object_t *obj);
 void of_bsn_tlv_vlan_vid_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
@@ -1005,6 +1007,8 @@ void of_bsn_vlan_counter_stats_reply_wire_object_id_get(of_object_t *obj, of_obj
 void of_bsn_vlan_counter_stats_reply_push_wire_types(of_object_t *obj);
 void of_bsn_vlan_counter_stats_request_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_vlan_counter_stats_request_push_wire_types(of_object_t *obj);
+void of_bsn_vlan_mac_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
+void of_bsn_vlan_mac_push_wire_types(of_object_t *obj);
 void of_bsn_vrf_counter_stats_entry_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_vrf_counter_stats_entry_push_wire_types(of_object_t *obj);
 void of_bsn_vrf_counter_stats_reply_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
@@ -1241,6 +1245,8 @@ void of_bad_property_error_msg_wire_object_id_get(of_object_t *obj, of_object_id
 void of_bad_property_error_msg_push_wire_types(of_object_t *obj);
 void of_bsn_generic_async_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_generic_async_push_wire_types(of_object_t *obj);
+void of_bsn_generic_command_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
+void of_bsn_generic_command_push_wire_types(of_object_t *obj);
 void of_bsn_takeover_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_takeover_push_wire_types(of_object_t *obj);
 void of_bundle_add_msg_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
@@ -1372,6 +1378,7 @@ typedef of_object_t of_bsn_flow_idle_enable_get_request_t;
 typedef of_object_t of_bsn_flow_idle_enable_set_reply_t;
 typedef of_object_t of_bsn_flow_idle_enable_set_request_t;
 typedef of_object_t of_bsn_generic_async_t;
+typedef of_object_t of_bsn_generic_command_t;
 typedef of_object_t of_bsn_generic_stats_reply_t;
 typedef of_object_t of_bsn_generic_stats_request_t;
 typedef of_object_t of_bsn_gentable_bucket_stats_reply_t;
@@ -1729,12 +1736,14 @@ typedef of_object_t of_bsn_tlv_unicast_rate_t;
 typedef of_object_t of_bsn_tlv_unknown_multicast_rate_t;
 typedef of_object_t of_bsn_tlv_use_packet_state_t;
 typedef of_object_t of_bsn_tlv_vfi_t;
+typedef of_object_t of_bsn_tlv_vlan_mac_list_t;
 typedef of_object_t of_bsn_tlv_vlan_pcp_t;
 typedef of_object_t of_bsn_tlv_vlan_vid_t;
 typedef of_object_t of_bsn_tlv_vlan_vid_mask_t;
 typedef of_object_t of_bsn_tlv_vni_t;
 typedef of_object_t of_bsn_tlv_vrf_t;
 typedef of_object_t of_bsn_vlan_counter_stats_entry_t;
+typedef of_object_t of_bsn_vlan_mac_t;
 typedef of_object_t of_bsn_vport_t;
 typedef of_object_t of_bsn_vport_l2gre_t;
 typedef of_object_t of_bsn_vport_q_in_q_t;
@@ -2020,6 +2029,7 @@ typedef of_object_t of_list_bsn_switch_pipeline_stats_entry_t;
 typedef of_object_t of_list_bsn_table_checksum_stats_entry_t;
 typedef of_object_t of_list_bsn_tlv_t;
 typedef of_object_t of_list_bsn_vlan_counter_stats_entry_t;
+typedef of_object_t of_list_bsn_vlan_mac_t;
 typedef of_object_t of_list_bsn_vrf_counter_stats_entry_t;
 typedef of_object_t of_list_bucket_t;
 typedef of_object_t of_list_bucket_counter_t;
@@ -2259,6 +2269,11 @@ extern of_object_t *
 extern void of_bsn_generic_async_init(
     of_object_t *obj, of_version_t version, int bytes, int clean_wire);
 
+extern of_object_t *
+    of_bsn_generic_command_new(of_version_t version);
+extern void of_bsn_generic_command_init(
+    of_object_t *obj, of_version_t version, int bytes, int clean_wire);
+
 extern of_object_t *
     of_bsn_generic_stats_reply_new(of_version_t version);
 extern void of_bsn_generic_stats_reply_init(
@@ -4044,6 +4059,11 @@ extern of_object_t *
 extern void of_bsn_tlv_vfi_init(
     of_object_t *obj, of_version_t version, int bytes, int clean_wire);
 
+extern of_object_t *
+    of_bsn_tlv_vlan_mac_list_new(of_version_t version);
+extern void of_bsn_tlv_vlan_mac_list_init(
+    of_object_t *obj, of_version_t version, int bytes, int clean_wire);
+
 extern of_object_t *
     of_bsn_tlv_vlan_pcp_new(of_version_t version);
 extern void of_bsn_tlv_vlan_pcp_init(
@@ -4074,6 +4094,11 @@ extern of_object_t *
 extern void of_bsn_vlan_counter_stats_entry_init(
     of_object_t *obj, of_version_t version, int bytes, int clean_wire);
 
+extern of_object_t *
+    of_bsn_vlan_mac_new(of_version_t version);
+extern void of_bsn_vlan_mac_init(
+    of_object_t *obj, of_version_t version, int bytes, int clean_wire);
+
 extern of_object_t *
     of_bsn_vport_new(of_version_t version);
 extern void of_bsn_vport_init(
@@ -5499,6 +5524,11 @@ extern of_object_t *
 extern void of_list_bsn_vlan_counter_stats_entry_init(
     of_object_t *obj, of_version_t version, int bytes, int clean_wire);
 
+extern of_object_t *
+    of_list_bsn_vlan_mac_new(of_version_t version);
+extern void of_list_bsn_vlan_mac_init(
+    of_object_t *obj, of_version_t version, int bytes, int clean_wire);
+
 extern of_object_t *
     of_list_bsn_vrf_counter_stats_entry_new(of_version_t version);
 extern void of_list_bsn_vrf_counter_stats_entry_init(
@@ -6077,6 +6107,17 @@ of_bsn_generic_async_delete(of_object_t *obj) {
     of_object_delete(obj);
 }
 
+/**
+ * Delete an object of type of_bsn_generic_command_t
+ * @param obj An instance of type of_bsn_generic_command_t
+ *
+ * \ingroup of_bsn_generic_command
+ */
+static inline void
+of_bsn_generic_command_delete(of_object_t *obj) {
+    of_object_delete(obj);
+}
+
 /**
  * Delete an object of type of_bsn_generic_stats_reply_t
  * @param obj An instance of type of_bsn_generic_stats_reply_t
@@ -10004,6 +10045,17 @@ of_bsn_tlv_vfi_delete(of_object_t *obj) {
     of_object_delete(obj);
 }
 
+/**
+ * Delete an object of type of_bsn_tlv_vlan_mac_list_t
+ * @param obj An instance of type of_bsn_tlv_vlan_mac_list_t
+ *
+ * \ingroup of_bsn_tlv_vlan_mac_list
+ */
+static inline void
+of_bsn_tlv_vlan_mac_list_delete(of_object_t *obj) {
+    of_object_delete(obj);
+}
+
 /**
  * Delete an object of type of_bsn_tlv_vlan_pcp_t
  * @param obj An instance of type of_bsn_tlv_vlan_pcp_t
@@ -10070,6 +10122,17 @@ of_bsn_vlan_counter_stats_entry_delete(of_object_t *obj) {
     of_object_delete(obj);
 }
 
+/**
+ * Delete an object of type of_bsn_vlan_mac_t
+ * @param obj An instance of type of_bsn_vlan_mac_t
+ *
+ * \ingroup of_bsn_vlan_mac
+ */
+static inline void
+of_bsn_vlan_mac_delete(of_object_t *obj) {
+    of_object_delete(obj);
+}
+
 /**
  * Delete an object of type of_bsn_vport_t
  * @param obj An instance of type of_bsn_vport_t
@@ -13205,6 +13268,17 @@ of_list_bsn_vlan_counter_stats_entry_delete(of_object_t *obj) {
     of_object_delete(obj);
 }
 
+/**
+ * Delete an object of type of_list_bsn_vlan_mac_t
+ * @param obj An instance of type of_list_bsn_vlan_mac_t
+ *
+ * \ingroup of_list_bsn_vlan_mac
+ */
+static inline void
+of_list_bsn_vlan_mac_delete(of_object_t *obj) {
+    of_object_delete(obj);
+}
+
 /**
  * Delete an object of type of_list_bsn_vrf_counter_stats_entry_t
  * @param obj An instance of type of_list_bsn_vrf_counter_stats_entry_t
@@ -14713,6 +14787,45 @@ extern void of_bsn_generic_async_tlvs_bind(
 extern of_list_bsn_tlv_t *of_bsn_generic_async_tlvs_get(
     of_bsn_generic_async_t *obj);
 
+/* Unified accessor functions for of_bsn_generic_command */
+
+extern void of_bsn_generic_command_xid_set(
+    of_bsn_generic_command_t *obj,
+    uint32_t xid);
+extern void of_bsn_generic_command_xid_get(
+    of_bsn_generic_command_t *obj,
+    uint32_t *xid);
+
+extern void of_bsn_generic_command_experimenter_set(
+    of_bsn_generic_command_t *obj,
+    uint32_t experimenter);
+extern void of_bsn_generic_command_experimenter_get(
+    of_bsn_generic_command_t *obj,
+    uint32_t *experimenter);
+
+extern void of_bsn_generic_command_subtype_set(
+    of_bsn_generic_command_t *obj,
+    uint32_t subtype);
+extern void of_bsn_generic_command_subtype_get(
+    of_bsn_generic_command_t *obj,
+    uint32_t *subtype);
+
+extern void of_bsn_generic_command_name_set(
+    of_bsn_generic_command_t *obj,
+    of_str64_t name);
+extern void of_bsn_generic_command_name_get(
+    of_bsn_generic_command_t *obj,
+    of_str64_t *name);
+
+extern int WARN_UNUSED_RESULT of_bsn_generic_command_tlvs_set(
+    of_bsn_generic_command_t *obj,
+    of_list_bsn_tlv_t *tlvs);
+extern void of_bsn_generic_command_tlvs_bind(
+    of_bsn_generic_command_t *obj,
+    of_list_bsn_tlv_t *tlvs);
+extern of_list_bsn_tlv_t *of_bsn_generic_command_tlvs_get(
+    of_bsn_generic_command_t *obj);
+
 /* Unified accessor functions for of_bsn_generic_stats_reply */
 
 extern void of_bsn_generic_stats_reply_xid_set(
@@ -21953,6 +22066,17 @@ extern void of_bsn_tlv_vfi_value_get(
     of_bsn_tlv_vfi_t *obj,
     uint16_t *value);
 
+/* Unified accessor functions for of_bsn_tlv_vlan_mac_list */
+
+extern int WARN_UNUSED_RESULT of_bsn_tlv_vlan_mac_list_key_set(
+    of_bsn_tlv_vlan_mac_list_t *obj,
+    of_list_bsn_vlan_mac_t *key);
+extern void of_bsn_tlv_vlan_mac_list_key_bind(
+    of_bsn_tlv_vlan_mac_list_t *obj,
+    of_list_bsn_vlan_mac_t *key);
+extern of_list_bsn_vlan_mac_t *of_bsn_tlv_vlan_mac_list_key_get(
+    of_bsn_tlv_vlan_mac_list_t *obj);
+
 /* Unified accessor functions for of_bsn_tlv_vlan_pcp */
 
 extern void of_bsn_tlv_vlan_pcp_value_set(
@@ -22016,6 +22140,22 @@ extern void of_bsn_vlan_counter_stats_entry_values_bind(
 extern of_list_uint64_t *of_bsn_vlan_counter_stats_entry_values_get(
     of_bsn_vlan_counter_stats_entry_t *obj);
 
+/* Unified accessor functions for of_bsn_vlan_mac */
+
+extern void of_bsn_vlan_mac_vlan_vid_set(
+    of_bsn_vlan_mac_t *obj,
+    uint16_t vlan_vid);
+extern void of_bsn_vlan_mac_vlan_vid_get(
+    of_bsn_vlan_mac_t *obj,
+    uint16_t *vlan_vid);
+
+extern void of_bsn_vlan_mac_mac_set(
+    of_bsn_vlan_mac_t *obj,
+    of_mac_addr_t mac);
+extern void of_bsn_vlan_mac_mac_get(
+    of_bsn_vlan_mac_t *obj,
+    of_mac_addr_t *mac);
+
 /* Unified accessor functions for of_bsn_vport_l2gre */
 
 extern void of_bsn_vport_l2gre_flags_set(
@@ -26571,6 +26711,29 @@ extern int of_list_bsn_vlan_counter_stats_entry_append(
          (rv) == OF_ERROR_NONE;   \
          (rv) = of_list_bsn_vlan_counter_stats_entry_next((list), (elt)))
 
+/* Unified accessor functions for of_list_bsn_vlan_mac */
+
+extern int of_list_bsn_vlan_mac_first(
+    of_list_bsn_vlan_mac_t *list, of_object_t *iter);
+extern int of_list_bsn_vlan_mac_next(
+    of_list_bsn_vlan_mac_t *list, of_object_t *iter);
+extern int of_list_bsn_vlan_mac_append_bind(
+    of_list_bsn_vlan_mac_t *list, of_object_t *iter);
+extern int of_list_bsn_vlan_mac_append(
+    of_list_bsn_vlan_mac_t *list, of_object_t *iter);
+
+/**
+ * Iteration macro for list of type of_list_bsn_vlan_mac
+ * @param list Pointer to the list being iterated over of
+ * type of_list_bsn_vlan_mac
+ * @param elt Pointer to an element of type of_bsn_vlan_mac
+ * @param rv On exiting the loop will have the value OF_ERROR_RANGE.
+ */
+#define OF_LIST_BSN_VLAN_MAC_ITER(list, elt, rv)  \
+    for ((rv) = of_list_bsn_vlan_mac_first((list), (elt));   \
+         (rv) == OF_ERROR_NONE;   \
+         (rv) = of_list_bsn_vlan_mac_next((list), (elt)))
+
 /* Unified accessor functions for of_list_bsn_vrf_counter_stats_entry */
 
 extern int of_list_bsn_vrf_counter_stats_entry_first(

loci/inc/loci/loci_doc.h

@@ -874,6 +874,33 @@ typedef struct of_bsn_flow_idle_enable_set_request_s of_bsn_flow_idle_enable_set
  */
 typedef struct of_bsn_generic_async_s of_bsn_generic_async_t;
 
+/**
+ * Structure for of_bsn_generic_command object.  Get/set
+ * accessors available in all versions unless noted otherwise
+ *
+ * @param xid_get/set ( OF_1_4).
+ *   Accessors for xid, a variable of type uint32.  Functions
+ *   are of type of_bsn_generic_command_uint32_get_f and _set_f.
+ *
+ * @param experimenter_get/set ( OF_1_4).
+ *   Accessors for experimenter, a variable of type uint32.  Functions
+ *   are of type of_bsn_generic_command_uint32_get_f and _set_f.
+ *
+ * @param subtype_get/set ( OF_1_4).
+ *   Accessors for subtype, a variable of type uint32.  Functions
+ *   are of type of_bsn_generic_command_uint32_get_f and _set_f.
+ *
+ * @param name_get/set ( OF_1_4).
+ *   Accessors for name, a variable of type of_str64.  Functions
+ *   are of type of_bsn_generic_command_of_str64_get_f and _set_f.
+ *
+ * @param tlvs_get/set ( OF_1_4).
+ *   Accessors for tlvs, a variable of type of_list_bsn_tlv.  Functions
+ *   are of type of_bsn_generic_command_of_list_bsn_tlv_get_f and _set_f.
+ *
+ */
+typedef struct of_bsn_generic_command_s of_bsn_generic_command_t;
+
 /**
  * Structure for of_bsn_generic_stats_reply object.  Get/set
  * accessors available in all versions unless noted otherwise
@@ -7321,6 +7348,17 @@ typedef struct of_bsn_tlv_use_packet_state_s of_bsn_tlv_use_packet_state_t;
  */
 typedef struct of_bsn_tlv_vfi_s of_bsn_tlv_vfi_t;
 
+/**
+ * Structure for of_bsn_tlv_vlan_mac_list object.  Get/set
+ * accessors available in all versions unless noted otherwise
+ *
+ * @param key_get/set ( OF_1_3 OF_1_4).
+ *   Accessors for key, a variable of type of_list_bsn_vlan_mac.  Functions
+ *   are of type of_bsn_tlv_vlan_mac_list_of_list_bsn_vlan_mac_get_f and _set_f.
+ *
+ */
+typedef struct of_bsn_tlv_vlan_mac_list_s of_bsn_tlv_vlan_mac_list_t;
+
 /**
  * Structure for of_bsn_tlv_vlan_pcp object.  Get/set
  * accessors available in all versions unless noted otherwise
@@ -7391,6 +7429,21 @@ typedef struct of_bsn_tlv_vrf_s of_bsn_tlv_vrf_t;
  */
 typedef struct of_bsn_vlan_counter_stats_entry_s of_bsn_vlan_counter_stats_entry_t;
 
+/**
+ * Structure for of_bsn_vlan_mac object.  Get/set
+ * accessors available in all versions unless noted otherwise
+ *
+ * @param vlan_vid_get/set ( OF_1_3 OF_1_4).
+ *   Accessors for vlan_vid, a variable of type uint16.  Functions
+ *   are of type of_bsn_vlan_mac_uint16_get_f and _set_f.
+ *
+ * @param mac_get/set ( OF_1_3 OF_1_4).
+ *   Accessors for mac, a variable of type of_mac_addr.  Functions
+ *   are of type of_bsn_vlan_mac_of_mac_addr_get_f and _set_f.
+ *
+ */
+typedef struct of_bsn_vlan_mac_s of_bsn_vlan_mac_t;
+
 /**
  * Structure for of_bsn_vport object.  Get/set
  * accessors available in all versions unless noted otherwise
@@ -11714,6 +11767,21 @@ typedef struct of_list_bsn_tlv_s of_list_bsn_tlv_t;
  */
 typedef struct of_list_bsn_vlan_counter_stats_entry_s of_list_bsn_vlan_counter_stats_entry_t;
 
+/**
+ * Structure for of_list_bsn_vlan_mac object.  Get/set
+ * accessors available in all versions unless noted otherwise
+ *
+ * @param first Function of type of_list_bsn_vlan_mac_first_f.
+ * Setup a TBD class object to the first entry in the list
+ * @param next Function of type of_list_bsn_vlan_mac_next_f.
+ * Advance a TBD class object to the next entry in the list
+ * @param append_bind Function of type of_list_bsn_vlan_mac_append_bind_f
+ * Setup a TBD class object for append to the end of the current list
+ * @param append  Function of type @ref of_list_bsn_vlan_mac_append_f.
+ * Copy an item to the end of a list
+ */
+typedef struct of_list_bsn_vlan_mac_s of_list_bsn_vlan_mac_t;
+
 /**
  * Structure for of_list_bsn_vrf_counter_stats_entry object.  Get/set
  * accessors available in all versions unless noted otherwise