Merge "Add Oplink experimenter messages"
diff --git a/openflow_input/calient b/openflow_input/calient
index 2818e64..038d458 100644
--- a/openflow_input/calient
+++ b/openflow_input/calient
@@ -25,9 +25,9 @@
};
enum ofp_calient_ocs_alarm(wire_type=uint8_t, bitmask=True){
- OFPOCSALM_CLEAR = 1, /* Clear- no alarm */
- OFPOCSALM_Minor = 2, /* loss is greater than 5.25 */
- OFPOCSALM_Major = 3, /* loss is greater than 7.25 */
- OFPOCSALM_Critical = 4, /* loss is greater than 10.25 */
+ OFPOCSALM_UNKNOWN=0, /* level is not relevant, or s/w bug */
+ OFPOCSALM_NORMAL = 1, /* Clear- no alarm */
+ OFPOCSALM_MINOR = 2, /* loss is greater than 5.25 */
+ OFPOCSALM_MAJOR = 3, /* loss is greater than 7.25 */
+ OFPOCSALM_CRITICAL = 4, /* loss is greater than 10.25 */
};
-
diff --git a/openflow_input/calient_flow_stats b/openflow_input/calient_flow_stats
index c07f4f1..05f6a2c 100644
--- a/openflow_input/calient_flow_stats
+++ b/openflow_input/calient_flow_stats
@@ -23,23 +23,33 @@
};
enum ofp_calient_cflow_admin_state(wire_type=uint8_t, bitmask=True){
- OFPCAS_InService = 1, /* when the connection is activated */
- OFPCAS_UnderManagement = 2,/*Default Connection state – (when connection is not activated)*/
+ OFPCAS_InService = 0, // Enabled to provide service
+ OFPCAS_Outofservice = 1, //Not enabled to provide service
+ OFPCAS_OOS_NP = 2, //Not yet added to system by operator
+ OFPCAS_UnderManagement = 3,//Configured to provide service, but suspended for maintanance
+ OFPCAS_Ready = 4 // awaiting activation, IS but not monitored
};
-
+
enum ofp_calient_cflow_operational_state(wire_type=uint8_t, bitmask=True){
- OFPCOS_InService = 1, /* When connection is activated */
- OFPCOS_OutOfService = 2,/*When connection has a critical alarm ( activated or otherwise) */
- OFPCOS_Ready = 3, /*When AS state is UnderManagement */
- OFPCOS_Degraded = 4, /*When connection is activated and has a Major alarm */
+ OFPCOS_InService = 0, //Functioning normally & providing service
+ OFPCOS_OutOfService = 1,//Not providing service
+ OFPOS_Initializing = 2, //Initializing
+ OFPCOS_Ready = 3, //awaiting activation
+ OFPCOS_Degraded = 4, //component failure causing reduced level of support
+ OFPCOS_Diagnostics=5 //performing diagnostics
};
-
+
enum ofp_calient_cflow_Capability(wire_type=uint8_t, bitmask=True){
- OFPCCS_Ok = 1, /* Connection has been made successfully */
- OFPCCS_Failed = 2, /* Connection has Failed */
- OFPCCS_Initializing = 3,/* Connection making is in progress */
+ OFPCS_NoHardware = 0, /* when port is not in connection */
+ OFPCCS_Ok = 1, /* port is in Connection which is made successfully */
+ OFPCCS_Failed = 2, /* when port is in Connection which is Failed */
+ OFPCCS_Initializing = 3,/* when port is in Connection which is being made */
+ OFPCS_Diagnostics=4, // performing diagnostics
+ OFPCS_Synchronizing=5 // Synchronizing
};
+
+
/*oper_capability,alarm,cflow_name not present in the backend */
struct of_calient_flow_stats_entry {
uint16_t length;
@@ -64,6 +74,7 @@
pad(2);
of_str64_t cflow_name; /* Connection name */
of_match_t match;
+ list(of_instruction_t)instructions;
};
diff --git a/openflow_input/calient_port_desc_stats b/openflow_input/calient_port_desc_stats
index 8734852..6763315 100644
--- a/openflow_input/calient_port_desc_stats
+++ b/openflow_input/calient_port_desc_stats
@@ -20,27 +20,32 @@
enum ofp_calient_optical_port_admin_state(wire_type=uint8_t, bitmask=True){
- OFPAS_IN_SERVICE = 1, /*Circuit Port in Service*/
- OFPAS_OUT_OF_SERVICE = 2, /*Circuit Port out of Service*/
- OFPAS_OOS_NP = 3 /*Circuit Port out of Service, not provisioned*/
+ OFPAS_IN_SERVICE = 0, // Enabled to provide service
+ OFPAS_OUT_OF_SERVICE = 1, //Not enabled to provide service
+ OFPAS_OOS_NP = 2, //Not yet added to system by operator
+ OFPAS_UNDERMANAGEMENT=3, // Configured to provide service, but suspended for maintanance
+ OFPAS_READY=4 // awaiting activation, IS but not monitored
};
enum ofp_calient_optical_port_oper_state(wire_type=uint8_t, bitmask=True){
- OFPOS_IN_SERVICE = 8, /*Circuit Port in Service*/
- OFPOS_OUT_OF_SERVICE = 16 /*Circuit Port out of Service*/
+ OFPOS_IN_SERVICE = 0, // Functioning normally & providing service
+ OFPOS_OUT_OF_SERVICE = 1, //Not providing service
+ OFPOS_INITIALIZING = 2, // Initializing
+ OFPOS_READY = 3, // awaiting activation
+ OFPOS_DEGRADED = 4, // component failure causing reduced level of support
+ OFPOS_DIAGNOSTICS=5 // performing diagnostics
};
enum ofp_calient_optical_port_oper_capability(wire_type=uint8_t, bitmask=True){
- OFPCS_NoHardware = 1, /* when port is not in connection */
- OFPCS_Ok = 2, /* port is in Connection which is made successfully */
- OFPCS_Failed = 3, /* when port is in Connection which is Failed */
- OFPCS_Initializing = 4,/* when port is in Connection which is being made */
+ OFPCS_NoHardware = 0, /* when port is not in connection */
+ OFPCS_Ok = 1, /* port is in Connection which is made successfully */
+ OFPCS_Failed = 2, /* when port is in Connection which is Failed */
+ OFPCS_Initializing = 3,/* when port is in Connection which is being made */
+ OFPCS_Diagnostics=4, // performing diagnostics
+ OFPCS_Synchronizing=5 // Synchronizing
};
-
-
-
struct of_calient_port_desc_prop_optical : of_calient_port_desc_prop{
uint16_t type == 2; /* OFPPDPT_OPTICAL_CIRCUIT */
uint16_t length; /* Length in bytes of this property. */